diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-25 11:02:03 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-25 11:03:19 +0200 |
| commit | c3a6c683e2bba4111a69a34303af13ff9a45b46a (patch) | |
| tree | d769537a9ef4b6602ce548bf4ccf037e1a78519f /cmake | |
| parent | f03f4da66373161d604b8ecf3c23ae18d08c0461 (diff) | |
| parent | 72b934e3f7d5f0c717cb98b718c9529c74741b4a (diff) | |
| download | mariadb-git-c3a6c683e2bba4111a69a34303af13ff9a45b46a.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/Internal/CPack/CPackRPM.cmake (renamed from cmake/CPackRPM.cmake) | 6 | ||||
| -rw-r--r-- | cmake/build_configurations/mysql_release.cmake | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/cmake/CPackRPM.cmake b/cmake/Internal/CPack/CPackRPM.cmake index 326013f06b3..2729667e319 100644 --- a/cmake/CPackRPM.cmake +++ b/cmake/Internal/CPack/CPackRPM.cmake @@ -50,7 +50,11 @@ endif() # load the original CPackRPM.cmake set(orig_CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}) unset(CMAKE_MODULE_PATH) -include(CPackRPM) +if (CMAKE_VERSION VERSION_GREATER "3.12.99") + include(Internal/CPack/CPackRPM) +else() + include(CPackRPM) +endif() set(CMAKE_MODULE_PATH ${orig_CMAKE_MODULE_PATH}) restore(LICENSE) diff --git a/cmake/build_configurations/mysql_release.cmake b/cmake/build_configurations/mysql_release.cmake index a6eb8fad3d2..3d2ba4fd18c 100644 --- a/cmake/build_configurations/mysql_release.cmake +++ b/cmake/build_configurations/mysql_release.cmake @@ -87,6 +87,7 @@ IF(FEATURE_SET) ENDIF() SET(WITH_INNODB_SNAPPY OFF CACHE STRING "") +SET(WITH_NUMA 0 CACHE BOOL "") IF(WIN32) SET(INSTALL_MYSQLTESTDIR "" CACHE STRING "") SET(INSTALL_SQLBENCHDIR "" CACHE STRING "") @@ -96,18 +97,15 @@ ELSEIF(RPM) SET(WITH_ZLIB system CACHE STRING "") SET(CHECKMODULE /usr/bin/checkmodule CACHE STRING "") SET(SEMODULE_PACKAGE /usr/bin/semodule_package CACHE STRING "") - SET(WITH_LIBARCHIVE ON CACHE STRING "") ELSEIF(DEB) SET(WITH_SSL system CACHE STRING "") SET(WITH_ZLIB system CACHE STRING "") SET(WITH_LIBWRAP ON) SET(HAVE_EMBEDDED_PRIVILEGE_CONTROL ON) - SET(WITH_LIBARCHIVE ON CACHE STRING "") ELSE() SET(WITH_SSL bundled CACHE STRING "") SET(WITH_ZLIB bundled CACHE STRING "") SET(WITH_JEMALLOC static CACHE STRING "") - SET(WITH_LIBARCHIVE STATIC CACHE STRING "") ENDIF() IF(NOT COMPILATION_COMMENT) |