diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2018-05-23 16:01:10 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2018-05-23 16:01:10 (GMT) |
| commit | 2b0fb7e3f1f7da5b23d430702493ed4fb7f87166 (patch) | |
| tree | 166087128e6ddc8f420f2860a4ec2eb07e24f95d /hl | |
| parent | eb8d35dd8cfd7339c203f758cf9637ac1cdc7a96 (diff) | |
| parent | 263db01df57a2aa99f81c060b988101c89f34fda (diff) | |
| download | hdf5-2b0fb7e3f1f7da5b23d430702493ed4fb7f87166.zip hdf5-2b0fb7e3f1f7da5b23d430702493ed4fb7f87166.tar.gz hdf5-2b0fb7e3f1f7da5b23d430702493ed4fb7f87166.tar.bz2 | |
Merge pull request #1077 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '263db01df57a2aa99f81c060b988101c89f34fda':
HDFFV-9739 only executes H5E tests in production
Remove link flag from compile command
Diffstat (limited to 'hl')
| -rw-r--r-- | hl/fortran/src/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | hl/fortran/test/CMakeLists.txt | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/hl/fortran/src/CMakeLists.txt b/hl/fortran/src/CMakeLists.txt index 902b8dc..fddfcf8 100644 --- a/hl/fortran/src/CMakeLists.txt +++ b/hl/fortran/src/CMakeLists.txt @@ -201,7 +201,6 @@ if (BUILD_SHARED_LIBS) "H5_BUILT_AS_DYNAMIC_LIB" PRIVATE $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:BUILD_HDF5_HL_DLL;HDF5F90_WINDOWS> - $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:/dll> $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:${WIN_COMPILE_FLAGS}> ) target_link_libraries (${HDF5_HL_F90_LIBSH_TARGET} diff --git a/hl/fortran/test/CMakeLists.txt b/hl/fortran/test/CMakeLists.txt index 6ee362d..923989d 100644 --- a/hl/fortran/test/CMakeLists.txt +++ b/hl/fortran/test/CMakeLists.txt @@ -47,7 +47,6 @@ macro (ADD_H5_FORTRAN_EXE file) ) target_compile_options(hl_f90_${file}-shared PRIVATE - $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:/dll> $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:${WIN_COMPILE_FLAGS}> ) target_link_libraries (hl_f90_${file}-shared |