diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2020-02-05 14:52:54 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2020-02-05 14:52:54 (GMT) |
| commit | 0d79831dcea8791599dae954e7f70eb072a96f66 (patch) | |
| tree | ec76379fd410f9604f78e46b2d36babae4a322c0 | |
| parent | 7e6d42864856aa390ea22fd7acbb20c3edb8c3c6 (diff) | |
| parent | 3ec66d55426c5c947eeb6f4d7d5d31b38f59ebf6 (diff) | |
| download | hdf5-0d79831dcea8791599dae954e7f70eb072a96f66.zip hdf5-0d79831dcea8791599dae954e7f70eb072a96f66.tar.gz hdf5-0d79831dcea8791599dae954e7f70eb072a96f66.tar.bz2 | |
Merge pull request #2343 in HDFFV/hdf5 from ~BYRN/hdf5_adb:bugfix/HDFFV-11012-fortran-include-paths to develop
* commit '3ec66d55426c5c947eeb6f4d7d5d31b38f59ebf6':
HDFFV-11012 - add correct fortran include path properties
| -rw-r--r-- | fortran/src/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | fortran/test/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | hl/fortran/src/CMakeLists.txt | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/fortran/src/CMakeLists.txt b/fortran/src/CMakeLists.txt index 0ec14ab..b380340 100644 --- a/fortran/src/CMakeLists.txt +++ b/fortran/src/CMakeLists.txt @@ -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 diff --git a/fortran/test/CMakeLists.txt b/fortran/test/CMakeLists.txt index 3c46c9e..a3cc552 100644 --- a/fortran/test/CMakeLists.txt +++ b/fortran/test/CMakeLists.txt @@ -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 diff --git a/hl/fortran/src/CMakeLists.txt b/hl/fortran/src/CMakeLists.txt index e532fff..91ec669 100644 --- a/hl/fortran/src/CMakeLists.txt +++ b/hl/fortran/src/CMakeLists.txt @@ -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 |