diff options
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/build_configurations/mysql_release.cmake | 1 | ||||
| -rw-r--r-- | cmake/cpack_rpm.cmake | 2 | ||||
| -rw-r--r-- | cmake/os/WindowsCache.cmake | 3 |
3 files changed, 4 insertions, 2 deletions
diff --git a/cmake/build_configurations/mysql_release.cmake b/cmake/build_configurations/mysql_release.cmake index ee8d00bc664..0b4a389db6d 100644 --- a/cmake/build_configurations/mysql_release.cmake +++ b/cmake/build_configurations/mysql_release.cmake @@ -74,7 +74,6 @@ IF(FEATURE_SET) ENDIF() IF(num GREATER FEATURE_SET_large) SET(PLUGIN_PARTITION "STATIC") - #SET(PLUGIN_CASSANDRA "STATIC") ENDIF() IF(num GREATER FEATURE_SET_xlarge) # OPTION(WITH_ALL ON) diff --git a/cmake/cpack_rpm.cmake b/cmake/cpack_rpm.cmake index f64d16918d2..873a75fb9e5 100644 --- a/cmake/cpack_rpm.cmake +++ b/cmake/cpack_rpm.cmake @@ -82,7 +82,7 @@ SET(CPACK_RPM_SPEC_MORE_DEFINE " %filter_provides_in \\\\.\\\\(test\\\\|result\\\\|h\\\\|cc\\\\|c\\\\|inc\\\\|opt\\\\|ic\\\\|cnf\\\\|rdiff\\\\|cpp\\\\)$ %filter_requires_in \\\\.\\\\(test\\\\|result\\\\|h\\\\|cc\\\\|c\\\\|inc\\\\|opt\\\\|ic\\\\|cnf\\\\|rdiff\\\\|cpp\\\\)$ %filter_from_provides /perl(\\\\(mtr\\\\|My::\\\\)/d -%filter_from_requires /\\\\(lib\\\\(ft\\\\|lzma\\\\|tokuportability\\\\)\\\\)\\\\|\\\\(perl(\\\\(.*mtr\\\\|My::\\\\|.*HandlerSocket\\\\|Mysql\\\\)\\\\)/d +%filter_from_requires /\\\\(liblzma\\\\)\\\\|\\\\(perl(\\\\(.*mtr\\\\|My::\\\\|.*HandlerSocket\\\\|Mysql\\\\)\\\\)/d %filter_setup } ") diff --git a/cmake/os/WindowsCache.cmake b/cmake/os/WindowsCache.cmake index 91e01708dce..7203868a086 100644 --- a/cmake/os/WindowsCache.cmake +++ b/cmake/os/WindowsCache.cmake @@ -336,4 +336,7 @@ SET(HAVE_LZ4_SHARED_LIB INTERNAL "") SET(HAVE_SYS_POLL_H CACHE INTERNAL "") SET(HAVE_SYS_SYSCALL_H CACHE INTERNAL "") SET(HAVE_SYS_STATVFS_H CACHE INTERNAL "") +SET(HAVE_GETPAGESIZES CACHE INTERNAL "") +SET(HAVE_LINUX_LIMITS_H CACHE INTERNAL "") +SET(HAVE_FILE_UCONTEXT_H CACHE INTERNAL "") ENDIF(MSVC) |