diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-30 11:04:27 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-30 11:04:27 +0300 |
| commit | 6da14d7b4a935466de55a6aa87db14bc359dbd30 (patch) | |
| tree | a2d1a73a6bf6bbe0dab2857fd87fa782969412f4 /cmake/build_configurations | |
| parent | 4783494a5e21939424ecca92bf23d2df65528266 (diff) | |
| parent | 2e1d10ecacc8ccfc0bda8a199c741ee36df981be (diff) | |
| download | mariadb-git-6da14d7b4a935466de55a6aa87db14bc359dbd30.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'cmake/build_configurations')
| -rw-r--r-- | cmake/build_configurations/mysql_release.cmake | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cmake/build_configurations/mysql_release.cmake b/cmake/build_configurations/mysql_release.cmake index 37a6c459260..c522c39571b 100644 --- a/cmake/build_configurations/mysql_release.cmake +++ b/cmake/build_configurations/mysql_release.cmake @@ -106,6 +106,7 @@ ELSEIF(DEB) SET(PLUGIN_AUTH_SOCKET YES CACHE STRING "") ELSE() SET(WITH_SSL bundled CACHE STRING "") + SET(WITH_PCRE bundled CACHE STRING "") SET(WITH_ZLIB bundled CACHE STRING "") SET(WITH_JEMALLOC static CACHE STRING "") SET(PLUGIN_AUTH_SOCKET STATIC CACHE STRING "") @@ -141,7 +142,7 @@ IF(UNIX) RedHat/Fedora/Oracle Linux: yum install libaio-devel SuSE: zypper install libaio-devel - If you really do not want it, pass -DIGNORE_AIO_CHECK to cmake. + If you really do not want it, pass -DIGNORE_AIO_CHECK=ON to cmake. ") ENDIF() |