diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2018-05-02 18:52:02 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2018-05-02 18:52:02 (GMT) |
| commit | 0c77fbaeb90b6b1e97b219c8176f8a02f2b57655 (patch) | |
| tree | f40e19173f7e25610317db834793024730e69dd1 /hl/fortran | |
| parent | c6827191f928a44012d200aaaa5319c603a700bd (diff) | |
| download | hdf5-0c77fbaeb90b6b1e97b219c8176f8a02f2b57655.zip hdf5-0c77fbaeb90b6b1e97b219c8176f8a02f2b57655.tar.gz hdf5-0c77fbaeb90b6b1e97b219c8176f8a02f2b57655.tar.bz2 | |
Fix defs and additional MSVC items
Diffstat (limited to 'hl/fortran')
| -rw-r--r-- | hl/fortran/src/CMakeLists.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/hl/fortran/src/CMakeLists.txt b/hl/fortran/src/CMakeLists.txt index 9999261..b032956 100644 --- a/hl/fortran/src/CMakeLists.txt +++ b/hl/fortran/src/CMakeLists.txt @@ -156,7 +156,7 @@ target_include_directories (${HDF5_HL_F90_LIB_TARGET} ) target_compile_definitions(${HDF5_HL_F90_LIB_TARGET} PUBLIC - $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:"HDF5F90_WINDOWS"> + $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:HDF5F90_WINDOWS> PRIVATE $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:${WIN_COMPILE_FLAGS}> ) @@ -189,7 +189,7 @@ if (BUILD_SHARED_LIBS) PUBLIC "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">:BUILD_HDF5_HL_DLL;HDF5F90_WINDOWS> $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:/dll> $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:${WIN_COMPILE_FLAGS}> ) @@ -199,7 +199,7 @@ if (BUILD_SHARED_LIBS) PRIVATE ${LINK_Fortran_LIBS} INTERFACE - $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:"/DLL /DEF:${HDF5_HL_F90_SRC_BINARY_DIR}/hdf5_hl_fortrandll.def"> + $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:"-DLL -DEF:${HDF5_HL_F90_SRC_BINARY_DIR}/hdf5_hl_fortrandll.def"> ) set_target_properties (${HDF5_HL_F90_LIBSH_TARGET} PROPERTIES FOLDER libraries/hl/fortran |