1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cmake: fewer Build-Depends in SRPM

Browse Source 
don't require tar/gtar, git, getconf, groff/nroff, and ruby.
This commit is contained in:
Sergei Golubchik 2021-05-21 10:52:12 +02:00
parent d7321893d8
commit f70b11c8c9
5 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -122,11 +122,13 @@ FOREACH(_base
ENDIF() ENDIF()
ENDFOREACH() ENDFOREACH()
IF(NOT RPM AND NOT DEB)
FOREACH(tool gtar tar git) FOREACH(tool gtar tar git)
STRING(TOUPPER ${tool} TOOL) STRING(TOUPPER ${tool} TOOL)
FIND_PROGRAM(${TOOL}_EXECUTABLE ${tool} DOC "path to the executable") FIND_PROGRAM(${TOOL}_EXECUTABLE ${tool} DOC "path to the executable")
MARK_AS_ADVANCED(${TOOL}_EXECUTABLE) MARK_AS_ADVANCED(${TOOL}_EXECUTABLE)
ENDFOREACH() ENDFOREACH()
ENDIF()
# Following autotools tradition, add preprocessor definitions # Following autotools tradition, add preprocessor definitions
# specified in environment variable CPPFLAGS # specified in environment variable CPPFLAGS

6
cmake/build_configurations/mysql_release.cmake
View File

@ -88,6 +88,12 @@ ENDIF()
SET(WITH_INNODB_SNAPPY OFF CACHE STRING "") SET(WITH_INNODB_SNAPPY OFF CACHE STRING "")
SET(WITH_NUMA 0 CACHE BOOL "") 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) IF(WIN32)
SET(INSTALL_MYSQLTESTDIR "" CACHE STRING "") SET(INSTALL_MYSQLTESTDIR "" CACHE STRING "")
SET(INSTALL_SQLBENCHDIR "" CACHE STRING "") SET(INSTALL_SQLBENCHDIR "" CACHE STRING "")

4
cmake/cpu_info.cmake
View File

@ -15,6 +15,8 @@
# Symbols with information about the CPU. # Symbols with information about the CPU.
IF(NOT DEFINED CPU_LEVEL1_DCACHE_LINESIZE)
IF(CMAKE_SYSTEM_NAME MATCHES "Darwin") IF(CMAKE_SYSTEM_NAME MATCHES "Darwin")
FIND_PROGRAM(SYSCTL sysctl) FIND_PROGRAM(SYSCTL sysctl)
MARK_AS_ADVANCED(SYSCTL) MARK_AS_ADVANCED(SYSCTL)
@ -37,3 +39,5 @@ ELSE()
) )
ENDIF() ENDIF()
ENDIF() ENDIF()
ENDIF()

2
dbug/CMakeLists.txt
View File

@ -29,7 +29,7 @@ IF(NOT CMAKE_CROSSCOMPILING)
TARGET_LINK_LIBRARIES(factorial dbug) TARGET_LINK_LIBRARIES(factorial dbug)
ENDIF() 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(GROFF groff)
FIND_PROGRAM(NROFF nroff) FIND_PROGRAM(NROFF nroff)
MARK_AS_ADVANCED(GROFF) MARK_AS_ADVANCED(GROFF)

11
storage/mroonga/vendor/groonga/CMakeLists.txt vendored
View File

@ -590,14 +590,13 @@ else()
set(GRN_WITH_MESSAGE_PACK FALSE) set(GRN_WITH_MESSAGE_PACK FALSE)
endif() endif()
find_program(RUBY NAMES
"ruby2.3" "ruby23"
"ruby2.2" "ruby22"
"ruby2.1" "ruby21"
"ruby")
option(GRN_WITH_MRUBY "use mruby" OFF) option(GRN_WITH_MRUBY "use mruby" OFF)
if(GRN_WITH_MRUBY) if(GRN_WITH_MRUBY)
find_program(RUBY NAMES
"ruby2.3" "ruby23"
"ruby2.2" "ruby22"
"ruby2.1" "ruby21"
"ruby")
set(MRUBY_INCLUDE_DIRS set(MRUBY_INCLUDE_DIRS
"${CMAKE_CURRENT_SOURCE_DIR}/vendor/mruby-source/include") "${CMAKE_CURRENT_SOURCE_DIR}/vendor/mruby-source/include")
set(MRUBY_LIBS mruby) set(MRUBY_LIBS mruby)