cmake: fewer Build-Depends in SRPM

don't require tar/gtar, git, getconf, groff/nroff, and ruby.

5 files changed, 18 insertions, 7 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1ce95c44d92..45efa38a9f7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -122,11 +122,13 @@ FOREACH(_base
   ENDIF()
 ENDFOREACH()
 
+IF(NOT RPM AND NOT DEB)
 FOREACH(tool gtar tar git)
  STRING(TOUPPER ${tool}  TOOL)
  FIND_PROGRAM(${TOOL}_EXECUTABLE ${tool} DOC "path to the executable")
  MARK_AS_ADVANCED(${TOOL}_EXECUTABLE)
 ENDFOREACH()
+ENDIF()
 
 # Following autotools tradition, add preprocessor definitions
 # specified in environment variable CPPFLAGS
diff --git a/cmake/build_configurations/mysql_release.cmake b/cmake/build_configurations/mysql_release.cmake
index dadfc78e18b..c9c394b6d03 100644
--- a/cmake/build_configurations/mysql_release.cmake
+++ b/cmake/build_configurations/mysql_release.cmake
@@ -88,6 +88,12 @@ ENDIF()
 
 SET(WITH_INNODB_SNAPPY OFF CACHE STRING "")
 SET(WITH_NUMA 0 CACHE BOOL "")
+SET(CPU_LEVEL1_DCACHE_LINESIZE 0)
+
+IF(NOT EXISTS ${CMAKE_SOURCE_DIR}/.git)
+  SET(GIT_EXECUTABLE GIT_EXECUTABLE-NOTFOUND CACHE FILEPATH "")
+ENDIF()
+
 IF(WIN32)
   SET(INSTALL_MYSQLTESTDIR "" CACHE STRING "")
   SET(INSTALL_SQLBENCHDIR  "" CACHE STRING "")
diff --git a/cmake/cpu_info.cmake b/cmake/cpu_info.cmake
index 1acfad5897f..2abeb5e12c1 100644
--- a/cmake/cpu_info.cmake
+++ b/cmake/cpu_info.cmake
@@ -15,6 +15,8 @@
 
 # Symbols with information about the CPU.
 
+IF(NOT DEFINED CPU_LEVEL1_DCACHE_LINESIZE)
+
 IF(CMAKE_SYSTEM_NAME MATCHES "Darwin")
   FIND_PROGRAM(SYSCTL sysctl)
   MARK_AS_ADVANCED(SYSCTL)
@@ -37,3 +39,5 @@ ELSE()
       )
   ENDIF()
 ENDIF()
+
+ENDIF()
diff --git a/dbug/CMakeLists.txt b/dbug/CMakeLists.txt
index 8941ac5fc27..a6573b7444e 100644
--- a/dbug/CMakeLists.txt
+++ b/dbug/CMakeLists.txt
@@ -29,7 +29,7 @@ IF(NOT CMAKE_CROSSCOMPILING)
   TARGET_LINK_LIBRARIES(factorial dbug)
 ENDIF()
 
-IF(NOT WIN32 AND NOT CMAKE_GENERATOR MATCHES Xcode)
+IF(NOT WIN32 AND NOT CMAKE_GENERATOR MATCHES Xcode AND NOT RPM AND NOT DEB)
   FIND_PROGRAM(GROFF groff)
   FIND_PROGRAM(NROFF nroff)
   MARK_AS_ADVANCED(GROFF)
diff --git a/storage/mroonga/vendor/groonga/CMakeLists.txt b/storage/mroonga/vendor/groonga/CMakeLists.txt
index e1f45b7fda9..998225d283c 100644
--- a/storage/mroonga/vendor/groonga/CMakeLists.txt
+++ b/storage/mroonga/vendor/groonga/CMakeLists.txt
@@ -590,14 +590,13 @@ else()
   set(GRN_WITH_MESSAGE_PACK FALSE)
 endif()
 
-find_program(RUBY NAMES
-  "ruby2.3" "ruby23"
-  "ruby2.2" "ruby22"
-  "ruby2.1" "ruby21"
-  "ruby")
-
 option(GRN_WITH_MRUBY "use mruby" OFF)
 if(GRN_WITH_MRUBY)
+  find_program(RUBY NAMES
+    "ruby2.3" "ruby23"
+    "ruby2.2" "ruby22"
+    "ruby2.1" "ruby21"
+    "ruby")
   set(MRUBY_INCLUDE_DIRS
     "${CMAKE_CURRENT_SOURCE_DIR}/vendor/mruby-source/include")
   set(MRUBY_LIBS mruby)