diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2020-02-05 15:57:06 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2020-02-05 15:57:06 (GMT) |
| commit | 891e45f88e3db445bad666f2660812b50d69ee9d (patch) | |
| tree | 974e652eccaf98b8af9fcbfc66d10e9b1b57b7bd /fortran | |
| parent | 5cac69efe847c356752f4b7d76cb6f4ebbf40615 (diff) | |
| parent | 7541b6abb9b679c32dbba70bec51807ca4165cdc (diff) | |
| download | hdf5-891e45f88e3db445bad666f2660812b50d69ee9d.zip hdf5-891e45f88e3db445bad666f2660812b50d69ee9d.tar.gz hdf5-891e45f88e3db445bad666f2660812b50d69ee9d.tar.bz2 | |
Merge pull request #2344 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_12 to hdf5_1_12
* commit '7541b6abb9b679c32dbba70bec51807ca4165cdc':
HDFFV-11012 fix fortran include properties
HDFFV-10996 merge java vol tests from develop
Diffstat (limited to 'fortran')
| -rw-r--r-- | fortran/src/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | fortran/test/CMakeLists.txt | 4 |
2 files changed, 4 insertions, 4 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 |