From 6afe013cde26ac9a038b705ac676d1c49d4280a1 Mon Sep 17 00:00:00 2001
From: Sergei Golubchik <serg@mariadb.org>
Date: Fri, 2 Aug 2019 17:57:49 +0200
Subject: [PATCH] always build wsrep libraries static

even if -DBUILD_SHARED_LIBS=ON was used
---
 CMakeLists.txt    | 11 ++++-------
 cmake/wsrep.cmake |  7 +++++++
 2 files changed, 11 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)
diff --git a/cmake/wsrep.cmake b/cmake/wsrep.cmake
index 0f97c0740ff..a6d843e5591 100644
--- a/cmake/wsrep.cmake
+++ b/cmake/wsrep.cmake
@@ -17,6 +17,7 @@
 #
 # Galera library does not compile with windows
 #
+IF (NOT WITHOUT_SERVER)
 IF(UNIX)
   SET(with_wsrep_default ON)
 ELSE()
@@ -57,4 +58,10 @@ Then restart the build.
   endif()
   INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/wsrep-lib/include)
   INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/wsrep-lib/wsrep-API/v26)
+
+  SET(old_BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS})
+  SET(BUILD_SHARED_LIBS OFF)
+  ADD_SUBDIRECTORY(wsrep-lib)
+  SET(BUILD_SHARED_LIBS ${old_BUILD_SHARED_LIBS})
 ENDIF()
+ENDIF(NOT WITHOUT_SERVER)