mirror of
https://github.com/MariaDB/server.git
synced 2026-05-16 11:57:38 +02:00
Merge bb-10.2-ext into 10.3
This commit is contained in:
commit
4a32e2395e
140 changed files with 860 additions and 325 deletions
|
|
@ -115,12 +115,14 @@ FOREACH(_base
|
|||
ENDIF()
|
||||
ENDFOREACH()
|
||||
|
||||
FOREACH(tool gtar tar git)
|
||||
FOREACH(tool gtar tar)
|
||||
STRING(TOUPPER ${tool} TOOL)
|
||||
FIND_PROGRAM(${TOOL}_EXECUTABLE ${tool} DOC "path to the executable")
|
||||
MARK_AS_ADVANCED(${TOOL}_EXECUTABLE)
|
||||
ENDFOREACH()
|
||||
|
||||
FIND_PACKAGE(Git)
|
||||
|
||||
# Following autotools tradition, add preprocessor definitions
|
||||
# specified in environment variable CPPFLAGS
|
||||
IF(DEFINED ENV{CPPFLAGS})
|
||||
|
|
@ -443,7 +445,6 @@ CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/include/mysql_version.h.in
|
|||
CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/sql/sql_builtin.cc.in
|
||||
${CMAKE_BINARY_DIR}/sql/sql_builtin.cc)
|
||||
|
||||
FIND_PACKAGE(Git)
|
||||
IF(GIT_EXECUTABLE)
|
||||
EXECUTE_PROCESS(
|
||||
COMMAND ${GIT_EXECUTABLE} rev-parse HEAD
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue