summaryrefslogtreecommitdiffstats
path: root/fortran/test
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2019-06-20 22:02:49 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2019-06-20 22:02:49 (GMT)
commit5fc5d947f084d1ef5d4c4a0bc2be55baa181f0fa (patch)
tree5c6aa4a7454471f022e952a3477a7774e2540226 /fortran/test
parent2e973f7e12301975f9d8dfdd5534682525554e77 (diff)
parentc24f11070aea56331110628d7645332534e4f227 (diff)
downloadhdf5-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/test')
-rw-r--r--fortran/test/CMakeLists.txt9
1 files changed, 4 insertions, 5 deletions
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 ()
#-----------------------------------------------------------------------------