diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2010-06-29 20:09:03 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2010-06-29 20:09:03 (GMT) |
| commit | 2f13382883e54af2d0584bb8b763ce6049d15826 (patch) | |
| tree | a30ee54236fa8ab56bfc49b6f7b4523d6df191c1 /hl/tools | |
| parent | eb5eba9aee6cb002b2a5278e00e232f4a2118bf6 (diff) | |
| download | hdf5-2f13382883e54af2d0584bb8b763ce6049d15826.zip hdf5-2f13382883e54af2d0584bb8b763ce6049d15826.tar.gz hdf5-2f13382883e54af2d0584bb8b763ce6049d15826.tar.bz2 | |
[svn-r19037] 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/tools')
| -rw-r--r-- | hl/tools/CMakeLists.txt | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/hl/tools/CMakeLists.txt b/hl/tools/CMakeLists.txt index b99e742..e8c729d 100644 --- a/hl/tools/CMakeLists.txt +++ b/hl/tools/CMakeLists.txt @@ -19,6 +19,16 @@ INCLUDE_DIRECTORIES (${HDF5_HL_TOOLS_SOURCE_DIR}/gif2h5) ADD_EXECUTABLE (gif2h5 ${GIF2H5_SRCS}) H5_NAMING (gif2h5) +IF (WIN32) + IF (MSVC) + IF (NOT BUILD_SHARED_LIBS) + SET_TARGET_PROPERTIES (gif2h5 + PROPERTIES + LINK_FLAGS "/NODEFAULTLIB:MSVCRT" + ) + ENDIF (NOT BUILD_SHARED_LIBS) + ENDIF (MSVC) +ENDIF (WIN32) TARGET_LINK_LIBRARIES (gif2h5 ${HDF5_HL_LIB_TARGET} ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET}) #-- Add h52gif program @@ -28,6 +38,16 @@ SET (hdf2gif_SRCS ) ADD_EXECUTABLE (hdf2gif ${hdf2gif_SRCS}) H5_NAMING (hdf2gif) +IF (WIN32) + IF (MSVC) + IF (NOT BUILD_SHARED_LIBS) + SET_TARGET_PROPERTIES (hdf2gif + PROPERTIES + LINK_FLAGS "/NODEFAULTLIB:MSVCRT" + ) + ENDIF (NOT BUILD_SHARED_LIBS) + ENDIF (MSVC) +ENDIF (WIN32) TARGET_LINK_LIBRARIES (hdf2gif ${HDF5_HL_LIB_TARGET} ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET}) # -------------------------------------------------------------------- @@ -38,6 +58,14 @@ TARGET_LINK_LIBRARIES (hdf2gif ${HDF5_HL_LIB_TARGET} ${HDF5_LIB_TARGET} ${HDF5_T IF (NOT BUILD_SHARED_LIBS) ADD_EXECUTABLE (hl_h52gifgentest ${HDF5_HL_TOOLS_SOURCE_DIR}/gif2h5/h52gifgentst.c) H5_NAMING (hl_h52gifgentest) + IF (WIN32) + IF (MSVC) + SET_TARGET_PROPERTIES (hl_h52gifgentest + PROPERTIES + LINK_FLAGS "/NODEFAULTLIB:MSVCRT" + ) + ENDIF (MSVC) + ENDIF (WIN32) TARGET_LINK_LIBRARIES (hl_h52gifgentest ${HDF5_HL_LIB_TARGET} ${HDF5_LIB_TARGET}) # ADD_TEST (NAME hl_h52gifgentest COMMAND $<TARGET_FILE:hl_h52gifgentest>) |