diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2019-08-02 17:57:49 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2019-08-26 23:33:42 +0200 |
| commit | 6afe013cde26ac9a038b705ac676d1c49d4280a1 (patch) | |
| tree | 3f54d7b1cbac47d31c252cb2ad0dd63cc1290751 /CMakeLists.txt | |
| parent | 58bfe9da54fb548031367f529823f20cc6f22b70 (diff) | |
| download | mariadb-git-6afe013cde26ac9a038b705ac676d1c49d4280a1.tar.gz | |
always build wsrep libraries static
even if -DBUILD_SHARED_LIBS=ON was used
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index e6cd55b81ee..59444ffd1c8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -145,9 +145,6 @@ INCLUDE(mysql_version) INCLUDE(cpack_source_ignore_files) INCLUDE(install_layout) INCLUDE(submodules) -INCLUDE(wsrep) -INCLUDE(cpack_rpm) -INCLUDE(cpack_deb) # Add macros INCLUDE(character_sets) @@ -244,6 +241,10 @@ IF(SECURITY_HARDENED AND NOT WITH_ASAN AND NOT WITH_UBSAN AND NOT WITH_TSAN) MY_CHECK_AND_SET_COMPILER_FLAG("-D_FORTIFY_SOURCE=2" RELEASE RELWITHDEBINFO) ENDIF() +INCLUDE(wsrep) +INCLUDE(cpack_rpm) +INCLUDE(cpack_deb) + # Always enable debug sync for debug builds. SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DENABLED_DEBUG_SYNC") SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DENABLED_DEBUG_SYNC") @@ -425,10 +426,6 @@ IF(NOT WITHOUT_SERVER) ADD_SUBDIRECTORY(unittest/embedded) ENDIF(WITH_EMBEDDED_SERVER) - IF(WITH_WSREP) - ADD_SUBDIRECTORY(wsrep-lib) - ENDIF() - ADD_SUBDIRECTORY(mysql-test) ADD_SUBDIRECTORY(mysql-test/lib/My/SafeProcess) ADD_SUBDIRECTORY(sql-bench) |