summaryrefslogtreecommitdiff
path: root/cmake/wsrep.cmake
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2013-02-07 19:01:19 +0100
committerSergei Golubchik <sergii@pisem.net>2013-02-07 19:01:19 +0100
commit53f5ea24313909f0aebaa5640a16edce4bbe1390 (patch)
treeb6dbc22a04056c732ae8d7934dd528fb53aa27e5 /cmake/wsrep.cmake
parent3f847afe4c7b1a26b73a4c9e38362278ea003640 (diff)
downloadmariadb-git-53f5ea24313909f0aebaa5640a16edce4bbe1390.tar.gz
restore changes that were lost in the merge
Diffstat (limited to 'cmake/wsrep.cmake')
-rw-r--r--cmake/wsrep.cmake4
1 files changed, 2 insertions, 2 deletions
diff --git a/cmake/wsrep.cmake b/cmake/wsrep.cmake
index 69a8c19ab1d..902ba8d5c30 100644
--- a/cmake/wsrep.cmake
+++ b/cmake/wsrep.cmake
@@ -47,13 +47,13 @@ SET(WSREP_VERSION
"${WSREP_API_VERSION}.${WSREP_PATCH_VERSION}.r${WSREP_PATCH_REVNO}"
)
-OPTION(WITH_WSREP "WSREP replication API (to use, e.g. Galera Replication library)" OFF)
+OPTION(WITH_WSREP "WSREP replication API (to use, e.g. Galera Replication library)" ON)
IF (WITH_WSREP)
SET(WSREP_C_FLAGS "-DWITH_WSREP -DWSREP_PROC_INFO -DMYSQL_MAX_VARIABLE_VALUE_LEN=2048")
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${WSREP_C_FLAGS}")
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${WSREP_C_FLAGS}")
SET(COMPILATION_COMMENT "${COMPILATION_COMMENT}, wsrep_${WSREP_VERSION}")
- SET(WITH_EMBEDDED_SERVER OFF)
+ SET(WITH_EMBEDDED_SERVER OFF CACHE INTERNAL "" FORCE)
ENDIF()
#