diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2013-06-17 16:42:06 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2013-06-17 16:42:06 (GMT) |
| commit | 2d604aabdd08a70a25058c1eadcc562ff557675e (patch) | |
| tree | 5025941b30adbb3b87f11b36804924b46016f00a | |
| parent | c124635d18158be289682ac153ced6b4b5a60032 (diff) | |
| download | hdf5-2d604aabdd08a70a25058c1eadcc562ff557675e.zip hdf5-2d604aabdd08a70a25058c1eadcc562ff557675e.tar.gz hdf5-2d604aabdd08a70a25058c1eadcc562ff557675e.tar.bz2 | |
[svn-r23787] Remove COMPILE_FLAGS value - already set in X_FLAGS
Add /MT support
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | config/cmake/UserMacros/Windows_MT.cmake | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 6b02c2c..4c2501a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -358,7 +358,7 @@ ENDIF (WIN32) IF (MSVC) SET (CMAKE_MFC_FLAG 0) - SET (WIN_COMPILE_FLAGS "/MD") + SET (WIN_COMPILE_FLAGS "") SET (WIN_LINK_FLAGS "") ENDIF (MSVC) diff --git a/config/cmake/UserMacros/Windows_MT.cmake b/config/cmake/UserMacros/Windows_MT.cmake index 3bd1607..9be5404 100644 --- a/config/cmake/UserMacros/Windows_MT.cmake +++ b/config/cmake/UserMacros/Windows_MT.cmake @@ -26,7 +26,7 @@ MACRO (TARGET_STATIC_CRT_FLAGS) STRING (REGEX REPLACE "/libs:dll" "/libs:static" ${flag_var} "${${flag_var}}") ENDIF (${flag_var} MATCHES "/libs:dll") ENDFOREACH (flag_var) - SET (WIN_COMPILE_FLAGS "/MT") + SET (WIN_COMPILE_FLAGS "") SET (WIN_LINK_FLAGS "/NODEFAULTLIB:MSVCRT") ENDIF (MSVC AND NOT BUILD_SHARED_LIBS) ENDMACRO (TARGET_STATIC_CRT_FLAGS) |