diff options
| -rw-r--r-- | cmake/os/Windows.cmake | 6 | ||||
| -rw-r--r-- | cmake/plugin.cmake | 5 | ||||
| -rw-r--r-- | configure.cmake | 1 | ||||
| -rw-r--r-- | mysql-test/include/mysqld--help.inc | 2 |
4 files changed, 8 insertions, 6 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() diff --git a/configure.cmake b/configure.cmake index b42a92cf7c5..663e3db9a66 100644 --- a/configure.cmake +++ b/configure.cmake @@ -182,7 +182,6 @@ IF(UNIX) ENDIF() ENDIF() ENDIF() -s # System check macros that do nothing on Windows. # Very often, it is known that some function is not available diff --git a/mysql-test/include/mysqld--help.inc b/mysql-test/include/mysqld--help.inc index e40e2a62a74..e318823d8af 100644 --- a/mysql-test/include/mysqld--help.inc +++ b/mysql-test/include/mysqld--help.inc @@ -14,7 +14,7 @@ perl; log-slow-queries pid-file slow-query-log-file datadir slave-load-tmpdir tmpdir/; @plugins=qw/innodb ndb archive blackhole federated partition ndbcluster safemalloc debug temp-pool ssl des-key-file - thread-concurrency super-large-pages mutex-deadlock-detector/; + thread-concurrency super-large-pages mutex-deadlock-detector null-audit/; @env=qw/MYSQLTEST_VARDIR MYSQL_TEST_DIR MYSQL_LIBDIR MYSQL_CHARSETSDIR MYSQL_SHAREDIR /; $re1=join('|', @skipvars, @plugins); $re2=join('|', @plugins); |