diff options
author | Allen Byrne <byrn@hdfgroup.org> | 2010-06-29 20:04:46 (GMT) |
---|---|---|
committer | Allen Byrne <byrn@hdfgroup.org> | 2010-06-29 20:04:46 (GMT) |
commit | 286b06971d15fc8a9df23144ff3ceb2c448c3520 (patch) | |
tree | bfdd81e3403074e10d6b63677737d2fa0b434532 /hl/fortran/test | |
parent | 5ed817f734dbc8252e2066db751c26d354af0b30 (diff) | |
download | hdf5-286b06971d15fc8a9df23144ff3ceb2c448c3520.zip hdf5-286b06971d15fc8a9df23144ff3ceb2c448c3520.tar.gz hdf5-286b06971d15fc8a9df23144ff3ceb2c448c3520.tar.bz2 |
[svn-r19036] Added executable Linker Flag for MSVC static builds: /NODEFAULTLIB:MSVCRT
Added VERSION vars for inclusion into auto snapshot version update script
Tested windows
Diffstat (limited to 'hl/fortran/test')
-rw-r--r-- | hl/fortran/test/CMakeLists.txt | 81 |
1 files changed, 48 insertions, 33 deletions
diff --git a/hl/fortran/test/CMakeLists.txt b/hl/fortran/test/CMakeLists.txt index 41cb675..14bd622 100644 --- a/hl/fortran/test/CMakeLists.txt +++ b/hl/fortran/test/CMakeLists.txt @@ -15,17 +15,22 @@ LINK_DIRECTORIES ( #-- Adding test for hl_f90_tstlite ADD_EXECUTABLE (hl_f90_tstlite tstlite.f90) H5_NAMING (hl_f90_tstlite) -IF (BUILD_SHARED_LIBS) - IF (WIN32) - IF (MSVC) - SET_TARGET_PROPERTIES (hl_f90_tstlite - PROPERTIES - COMPILE_FLAGS "/dll" - LINK_FLAGS "/SUBSYSTEM:CONSOLE" - ) - ENDIF (MSVC) - ENDIF (WIN32) -ENDIF (BUILD_SHARED_LIBS) +IF (WIN32) + IF (MSVC) + IF (BUILD_SHARED_LIBS) + SET_TARGET_PROPERTIES (hl_f90_tstlite + PROPERTIES + COMPILE_FLAGS "/dll" + LINK_FLAGS "/SUBSYSTEM:CONSOLE" + ) + ELSE (BUILD_SHARED_LIBS) + SET_TARGET_PROPERTIES (hl_f90_tstlite + PROPERTIES + LINK_FLAGS "/NODEFAULTLIB:MSVCRT" + ) + ENDIF (BUILD_SHARED_LIBS) + ENDIF (MSVC) +ENDIF (WIN32) TARGET_LINK_LIBRARIES (hl_f90_tstlite ${HDF5_HL_F90_LIB_TARGET} ${HDF5_F90_LIB_TARGET}) SET_TARGET_PROPERTIES (hl_f90_tstlite PROPERTIES LINKER_LANGUAGE Fortran) @@ -34,17 +39,22 @@ ADD_TEST (NAME hl_f90_tstlite COMMAND $<TARGET_FILE:hl_f90_tstlite>) #-- Adding test for hl_f90_tstimage ADD_EXECUTABLE (hl_f90_tstimage tstimage.f90) H5_NAMING (hl_f90_tstimage) -IF (BUILD_SHARED_LIBS) - IF (WIN32) - IF (MSVC) - SET_TARGET_PROPERTIES (hl_f90_tstimage - PROPERTIES - COMPILE_FLAGS "/dll" - LINK_FLAGS "/SUBSYSTEM:CONSOLE" - ) - ENDIF (MSVC) - ENDIF (WIN32) -ENDIF (BUILD_SHARED_LIBS) +IF (WIN32) + IF (MSVC) + IF (BUILD_SHARED_LIBS) + SET_TARGET_PROPERTIES (hl_f90_tstimage + PROPERTIES + COMPILE_FLAGS "/dll" + LINK_FLAGS "/SUBSYSTEM:CONSOLE" + ) + ELSE (BUILD_SHARED_LIBS) + SET_TARGET_PROPERTIES (hl_f90_tstimage + PROPERTIES + LINK_FLAGS "/NODEFAULTLIB:MSVCRT" + ) + ENDIF (BUILD_SHARED_LIBS) + ENDIF (MSVC) +ENDIF (WIN32) TARGET_LINK_LIBRARIES (hl_f90_tstimage ${HDF5_HL_F90_LIB_TARGET} ${HDF5_F90_LIB_TARGET}) SET_TARGET_PROPERTIES (hl_f90_tstimage PROPERTIES LINKER_LANGUAGE Fortran) @@ -53,17 +63,22 @@ ADD_TEST (NAME hl_f90_tstimage COMMAND $<TARGET_FILE:hl_f90_tstimage>) #-- Adding test for hl_f90_tsttable ADD_EXECUTABLE (hl_f90_tsttable tsttable.f90) H5_NAMING (hl_f90_tsttable) -IF (BUILD_SHARED_LIBS) - IF (WIN32) - IF (MSVC) - SET_TARGET_PROPERTIES (hl_f90_tsttable - PROPERTIES - COMPILE_FLAGS "/dll" - LINK_FLAGS "/SUBSYSTEM:CONSOLE" - ) - ENDIF (MSVC) - ENDIF (WIN32) -ENDIF (BUILD_SHARED_LIBS) +IF (WIN32) + IF (MSVC) + IF (BUILD_SHARED_LIBS) + SET_TARGET_PROPERTIES (hl_f90_tsttable + PROPERTIES + COMPILE_FLAGS "/dll" + LINK_FLAGS "/SUBSYSTEM:CONSOLE" + ) + ELSE (BUILD_SHARED_LIBS) + SET_TARGET_PROPERTIES (hl_f90_tsttable + PROPERTIES + LINK_FLAGS "/NODEFAULTLIB:MSVCRT" + ) + ENDIF (BUILD_SHARED_LIBS) + ENDIF (MSVC) +ENDIF (WIN32) TARGET_LINK_LIBRARIES (hl_f90_tsttable ${HDF5_HL_F90_LIB_TARGET} ${HDF5_F90_LIB_TARGET}) SET_TARGET_PROPERTIES (hl_f90_tsttable PROPERTIES LINKER_LANGUAGE Fortran) |