diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2019-06-20 22:02:49 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2019-06-20 22:02:49 (GMT) |
| commit | 5fc5d947f084d1ef5d4c4a0bc2be55baa181f0fa (patch) | |
| tree | 5c6aa4a7454471f022e952a3477a7774e2540226 /fortran | |
| parent | 2e973f7e12301975f9d8dfdd5534682525554e77 (diff) | |
| parent | c24f11070aea56331110628d7645332534e4f227 (diff) | |
| download | hdf5-5fc5d947f084d1ef5d4c4a0bc2be55baa181f0fa.zip hdf5-5fc5d947f084d1ef5d4c4a0bc2be55baa181f0fa.tar.gz hdf5-5fc5d947f084d1ef5d4c4a0bc2be55baa181f0fa.tar.bz2 | |
Merge pull request #1749 in HDFFV/hdf5 from ~BYRN/hdf5_merge_adb:develop to develop
* commit 'c24f11070aea56331110628d7645332534e4f227':
Add H5_HLDLL prefix for windows link
HDFFV-10805 cleanup examples and test code
Add missing fortran mods
HDFFV-10805 Fix test of library libinfo
Cleanup possible CMake target conflicts
Correct CMake issues
Diffstat (limited to 'fortran')
| -rw-r--r-- | fortran/src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | fortran/test/CMakeLists.txt | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/fortran/src/CMakeLists.txt b/fortran/src/CMakeLists.txt index 4e60361..b01e4d4 100644 --- a/fortran/src/CMakeLists.txt +++ b/fortran/src/CMakeLists.txt @@ -383,6 +383,7 @@ if (NOT ONLY_SHARED_LIBS) ${MOD_BUILD_DIR}/h5r.mod ${MOD_BUILD_DIR}/h5s.mod ${MOD_BUILD_DIR}/h5t.mod + ${MOD_BUILD_DIR}/h5vl.mod ${MOD_BUILD_DIR}/h5z.mod ${MOD_BUILD_DIR}/h5_gen.mod ) @@ -415,6 +416,7 @@ if (BUILD_SHARED_LIBS) ${MODSH_BUILD_DIR}/h5r.mod ${MODSH_BUILD_DIR}/h5s.mod ${MODSH_BUILD_DIR}/h5t.mod + ${MODSH_BUILD_DIR}/h5vl.mod ${MODSH_BUILD_DIR}/h5z.mod ${MODSH_BUILD_DIR}/h5_gen.mod ) diff --git a/fortran/test/CMakeLists.txt b/fortran/test/CMakeLists.txt index 3f049af..738638a 100644 --- a/fortran/test/CMakeLists.txt +++ b/fortran/test/CMakeLists.txt @@ -31,13 +31,12 @@ set_target_properties (H5_test_buildiface PROPERTIES Fortran_MODULE_DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY} ) -if (BUILD_SHARED_LIBS) - file (MAKE_DIRECTORY "${HDF5_FORTRAN_TESTS_BINARY_DIR}/shared") - set (MODSH_BUILD_DIR ${CMAKE_Fortran_MODULE_DIRECTORY}/shared/${HDF_CFG_BUILD_TYPE}) -endif () -if (NOT ONLY_SHARED_LIBS) +if (NOT BUILD_SHARED_LIBS) file (MAKE_DIRECTORY "${HDF5_FORTRAN_TESTS_BINARY_DIR}/static") set (MOD_BUILD_DIR ${CMAKE_Fortran_MODULE_DIRECTORY}/static/${HDF_CFG_BUILD_TYPE}) +else () + file (MAKE_DIRECTORY "${HDF5_FORTRAN_TESTS_BINARY_DIR}/shared") + set (MODSH_BUILD_DIR ${CMAKE_Fortran_MODULE_DIRECTORY}/shared/${HDF_CFG_BUILD_TYPE}) endif () #----------------------------------------------------------------------------- |