summaryrefslogtreecommitdiff
path: root/cmake
diff options
context:
space:
mode:
authorVladislav Vaintroub <wlad@montyprogram.com>2012-09-04 22:13:46 +0200
committerVladislav Vaintroub <wlad@montyprogram.com>2012-09-04 22:13:46 +0200
commit02abef584c607667395bbfc3686b7c7063f57206 (patch)
tree26b0531cb75d5a8b759a8d997be5c4cace3a132b /cmake
parent8e84b9e740ff3641f1fc500a616962cb3bc75a64 (diff)
downloadmariadb-git-02abef584c607667395bbfc3686b7c7063f57206.tar.gz
Fixes for galera build
- compile with WITH_WSREP on - fix package name
Diffstat (limited to 'cmake')
-rw-r--r--cmake/package_name.cmake2
-rw-r--r--cmake/wsrep.cmake2
2 files changed, 2 insertions, 2 deletions
diff --git a/cmake/package_name.cmake b/cmake/package_name.cmake
index 5c99a110e7c..37f619e7177 100644
--- a/cmake/package_name.cmake
+++ b/cmake/package_name.cmake
@@ -120,7 +120,7 @@ IF(NOT VERSION)
ELSEIF(MYSQL_SERVER_SUFFIX)
SET(PRODUCT_TAG "${MYSQL_SERVER_SUFFIX}") # Already has a leading dash
ELSE()
- SET(PRODUCT_TAG)
+ SET(PRODUCT_TAG "-galera")
ENDIF()
IF("${VERSION}" MATCHES "-ndb-")
diff --git a/cmake/wsrep.cmake b/cmake/wsrep.cmake
index bb646028285..5bfc39c66e6 100644
--- a/cmake/wsrep.cmake
+++ b/cmake/wsrep.cmake
@@ -47,7 +47,7 @@ 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}")