diff options
| author | Vladislav Vaintroub <vvaintroub@mysql.com> | 2010-01-26 22:05:41 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <vvaintroub@mysql.com> | 2010-01-26 22:05:41 +0100 |
| commit | cdb8cafb2731578cef674de3f71ff65e9ac055ae (patch) | |
| tree | 0ec8844bc8dda2a96e98ecf7498fcb4f7c8aa147 /cmake | |
| parent | bc80c38a5450125c4d4085d3c04cc271936d26b9 (diff) | |
| download | mariadb-git-cdb8cafb2731578cef674de3f71ff65e9ac055ae.tar.gz | |
Fixed typos and failed mysqld--help test.
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/os/Windows.cmake | 6 | ||||
| -rw-r--r-- | cmake/plugin.cmake | 5 |
2 files changed, 7 insertions, 4 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() diff --git a/cmake/plugin.cmake b/cmake/plugin.cmake index f312cd2d4e8..f4aaeb651d7 100644 --- a/cmake/plugin.cmake +++ b/cmake/plugin.cmake @@ -111,10 +111,9 @@ MACRO(MYSQL_ADD_PLUGIN) # Update mysqld dependencies SET (MYSQLD_STATIC_PLUGIN_LIBS ${MYSQLD_STATIC_PLUGIN_LIBS} - ${target} CACHE INTERNAL "") + ${target} CACHE INTERNAL "" FORCE) - - IF(ARG_STORAGE_ENGINE) + IF(NOT ARG_MANDATORY) SET(${with_var} ON CACHE BOOL "Link ${plugin} statically to the server" FORCE) ENDIF() |