philipp/hdf5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2343 in HDFFV/hdf5 from ~BYRN/hdf5_adb:bugfix/HDFFV-11012-fortran-include-paths to develop

Browse Source 
* commit '3ec66d55426c5c947eeb6f4d7d5d31b38f59ebf6':
  HDFFV-11012 - add correct fortran include path properties
This commit is contained in:
Allen Byrne
2020-02-05 08:52:54 -06:00
parent 7e6d428648 3ec66d5542
commit 0d79831dce
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
fortran/src/CMakeLists.txt
View File

@@ -267,7 +267,7 @@ if (NOT ONLY_SHARED_LIBS)
PRIVATE
"${HDF5_F90_SRC_SOURCE_DIR};${CMAKE_Fortran_MODULE_DIRECTORY}/static;${HDF5_F90_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_Fortran_INCLUDE_DIRS}>"
INTERFACE
"$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>"
"$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include/static>"
)
target_compile_definitions(${HDF5_F90_LIB_TARGET}
PRIVATE
@@ -307,7 +307,7 @@ if (BUILD_SHARED_LIBS)
PRIVATE
"${HDF5_F90_SRC_SOURCE_DIR};${CMAKE_Fortran_MODULE_DIRECTORY}/shared;${HDF5_F90_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_Fortran_INCLUDE_DIRS}>"
INTERFACE
"$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>"
"$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include/shared>"
)
target_compile_definitions(${HDF5_F90_LIBSH_TARGET}
PUBLIC

4
fortran/test/CMakeLists.txt
View File

@@ -132,7 +132,7 @@ if (NOT BUILD_SHARED_LIBS)
PRIVATE
"${CMAKE_Fortran_MODULE_DIRECTORY}/static;${HDF5_F90_BINARY_DIR};${HDF5_F90_BINARY_DIR}/static"
INTERFACE
"$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>"
"$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include/static>"
)
target_compile_definitions(${HDF5_F90_TEST_LIB_TARGET}
PRIVATE
@@ -165,7 +165,7 @@ else ()
PRIVATE
"${CMAKE_Fortran_MODULE_DIRECTORY}/shared;${HDF5_F90_BINARY_DIR};${HDF5_F90_BINARY_DIR}/shared"
INTERFACE
"$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>"
"$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include/shared>"
)
target_compile_definitions(${HDF5_F90_TEST_LIBSH_TARGET}
PUBLIC

4
hl/fortran/src/CMakeLists.txt
View File

@@ -164,7 +164,7 @@ if (NOT ONLY_SHARED_LIBS)
PRIVATE
"${HDF5_F90_BINARY_DIR};${CMAKE_Fortran_MODULE_DIRECTORY}/static;$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_Fortran_INCLUDE_DIRS}>"
INTERFACE
"$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>"
"$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include/static>"
)
target_compile_definitions(${HDF5_HL_F90_LIB_TARGET}
PUBLIC
@@ -201,7 +201,7 @@ if (BUILD_SHARED_LIBS)
PRIVATE
"${HDF5_F90_BINARY_DIR};${CMAKE_Fortran_MODULE_DIRECTORY}/shared;$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_Fortran_INCLUDE_DIRS}>"
INTERFACE
"$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>"
"$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include/shared>"
)
target_compile_definitions(${HDF5_HL_F90_LIBSH_TARGET}
PUBLIC