Commit 6afe013c authored by Sergei Golubchik's avatar Sergei Golubchik

always build wsrep libraries static

even if -DBUILD_SHARED_LIBS=ON was used
parent 58bfe9da
...@@ -145,9 +145,6 @@ INCLUDE(mysql_version) ...@@ -145,9 +145,6 @@ INCLUDE(mysql_version)
INCLUDE(cpack_source_ignore_files) INCLUDE(cpack_source_ignore_files)
INCLUDE(install_layout) INCLUDE(install_layout)
INCLUDE(submodules) INCLUDE(submodules)
INCLUDE(wsrep)
INCLUDE(cpack_rpm)
INCLUDE(cpack_deb)
# Add macros # Add macros
INCLUDE(character_sets) INCLUDE(character_sets)
...@@ -244,6 +241,10 @@ IF(SECURITY_HARDENED AND NOT WITH_ASAN AND NOT WITH_UBSAN AND NOT WITH_TSAN) ...@@ -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) MY_CHECK_AND_SET_COMPILER_FLAG("-D_FORTIFY_SOURCE=2" RELEASE RELWITHDEBINFO)
ENDIF() ENDIF()
INCLUDE(wsrep)
INCLUDE(cpack_rpm)
INCLUDE(cpack_deb)
# Always enable debug sync for debug builds. # Always enable debug sync for debug builds.
SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DENABLED_DEBUG_SYNC") SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DENABLED_DEBUG_SYNC")
SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_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) ...@@ -425,10 +426,6 @@ IF(NOT WITHOUT_SERVER)
ADD_SUBDIRECTORY(unittest/embedded) ADD_SUBDIRECTORY(unittest/embedded)
ENDIF(WITH_EMBEDDED_SERVER) ENDIF(WITH_EMBEDDED_SERVER)
IF(WITH_WSREP)
ADD_SUBDIRECTORY(wsrep-lib)
ENDIF()
ADD_SUBDIRECTORY(mysql-test) ADD_SUBDIRECTORY(mysql-test)
ADD_SUBDIRECTORY(mysql-test/lib/My/SafeProcess) ADD_SUBDIRECTORY(mysql-test/lib/My/SafeProcess)
ADD_SUBDIRECTORY(sql-bench) ADD_SUBDIRECTORY(sql-bench)
......
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
# #
# Galera library does not compile with windows # Galera library does not compile with windows
# #
IF (NOT WITHOUT_SERVER)
IF(UNIX) IF(UNIX)
SET(with_wsrep_default ON) SET(with_wsrep_default ON)
ELSE() ELSE()
...@@ -57,4 +58,10 @@ Then restart the build. ...@@ -57,4 +58,10 @@ Then restart the build.
endif() endif()
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/wsrep-lib/include) INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/wsrep-lib/include)
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/wsrep-lib/wsrep-API/v26) 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()
ENDIF(NOT WITHOUT_SERVER)
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment