mirror of
https://github.com/MariaDB/server.git
synced 2025-01-15 19:42:28 +01:00
cmake: fewer Build-Depends in SRPM
don't require tar/gtar, git, getconf, groff/nroff, and ruby.
This commit is contained in:
parent
d7321893d8
commit
f70b11c8c9
5 changed files with 18 additions and 7 deletions
|
@ -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
|
||||
|
|
|
@ -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 "")
|
||||
|
|
|
@ -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()
|
||||
|
|
|
@ -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)
|
||||
|
|
11
storage/mroonga/vendor/groonga/CMakeLists.txt
vendored
11
storage/mroonga/vendor/groonga/CMakeLists.txt
vendored
|
@ -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)
|
||||
|
|
Loading…
Reference in a new issue