summaryrefslogtreecommitdiff
path: root/cmake/os
diff options
context:
space:
mode:
authorVladislav Vaintroub <vvaintroub@mysql.com>2010-01-26 22:05:41 +0100
committerVladislav Vaintroub <vvaintroub@mysql.com>2010-01-26 22:05:41 +0100
commitcdb8cafb2731578cef674de3f71ff65e9ac055ae (patch)
tree0ec8844bc8dda2a96e98ecf7498fcb4f7c8aa147 /cmake/os
parentbc80c38a5450125c4d4085d3c04cc271936d26b9 (diff)
downloadmariadb-git-cdb8cafb2731578cef674de3f71ff65e9ac055ae.tar.gz
Fixed typos and failed mysqld--help test.
Diffstat (limited to 'cmake/os')
-rw-r--r--cmake/os/Windows.cmake6
1 files changed, 5 insertions, 1 deletions
diff --git a/cmake/os/Windows.cmake b/cmake/os/Windows.cmake
index 42917d0893d..5573ecf701e 100644
--- a/cmake/os/Windows.cmake
+++ b/cmake/os/Windows.cmake
@@ -64,13 +64,17 @@ IF(MSVC)
SET(CMAKE_{type}_LINKER_FLAGS_RELEASE "${CMAKE_${type}_LINKER_FLAGS_RELEASE} /debug")
ENDFOREACH()
- # Force static runtime libraries, and remove support for exception handling
+ # Force static runtime libraries
FOREACH(flag
CMAKE_C_FLAGS_RELEASE CMAKE_C_FLAGS_RELWITHDEBINFO
CMAKE_C_FLAGS_DEBUG CMAKE_C_FLAGS_DEBUG_INIT
CMAKE_CXX_FLAGS_RELEASE CMAKE_CXX_FLAGS_RELWITHDEBINFO
CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_DEBUG_INIT)
STRING(REPLACE "/MD" "/MT" "${flag}" "${${flag}}")
+ ENDFOREACH()
+
+ # Remove support for exceptions
+ FOREACH(flag CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_INIT)
STRING(REPLACE "/EHsc" "" "${flag}" "${${flag}}")
ENDFOREACH()