|
|
@ -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) |
|
|
|