diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2021-12-08 10:33:36 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2021-12-08 10:33:36 +0100 |
| commit | ef77c05126b34b72c5b98a051739b74e93f3eaca (patch) | |
| tree | 947eb192b1701a3991fc3eabc419454018e4fc97 /cmake/build_configurations | |
| parent | 60d565e66a76e42b4fb9c0c09aa0898e4a65d71d (diff) | |
| parent | 186c1fa25057a465f4725ef28ce3d878af20947b (diff) | |
| download | mariadb-git-ef77c05126b34b72c5b98a051739b74e93f3eaca.tar.gz | |
Merge branch '10.6' into 10.7
Diffstat (limited to 'cmake/build_configurations')
| -rw-r--r-- | cmake/build_configurations/mysql_release.cmake | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/cmake/build_configurations/mysql_release.cmake b/cmake/build_configurations/mysql_release.cmake index b9728ca1ab9..531352d0338 100644 --- a/cmake/build_configurations/mysql_release.cmake +++ b/cmake/build_configurations/mysql_release.cmake @@ -105,8 +105,7 @@ ELSEIF(RPM) SET(SEMODULE_PACKAGE /usr/bin/semodule_package CACHE FILEPATH "") SET(PLUGIN_AUTH_SOCKET YES CACHE STRING "") SET(WITH_EMBEDDED_SERVER ON CACHE BOOL "") - # not yet, SLES 12.3 doesn't provide pcre2 - #SET(WITH_PCRE system CACHE STRING "") + SET(WITH_PCRE system CACHE STRING "") IF(RPM MATCHES "fedora|centos|rhel") SET(WITH_ROCKSDB_BZip2 OFF CACHE STRING "") ENDIF() @@ -129,7 +128,6 @@ ELSE() SET(WITH_JEMALLOC static CACHE STRING "") SET(PLUGIN_AUTH_SOCKET STATIC CACHE STRING "") SET(WITH_STRIPPED_CLIENT ON CACHE BOOL "Strip all client binaries") - SET(WITH_PCRE bundled CACHE STRING "") SET(WITH_ROCKSDB_BZip2 OFF CACHE STRING "") SET(WITH_ROCKSDB_LZ4 OFF CACHE STRING "") ENDIF() |