Commit b75ca7e0 authored by Sergei Golubchik's avatar Sergei Golubchik

cleanup: remove a duplicate check for GIT_EXECUTABLE

parent d1d3aff9
...@@ -115,12 +115,14 @@ FOREACH(_base ...@@ -115,12 +115,14 @@ FOREACH(_base
ENDIF() ENDIF()
ENDFOREACH() ENDFOREACH()
FOREACH(tool gtar tar git) FOREACH(tool gtar tar)
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()
FIND_PACKAGE(Git)
# Following autotools tradition, add preprocessor definitions # Following autotools tradition, add preprocessor definitions
# specified in environment variable CPPFLAGS # specified in environment variable CPPFLAGS
IF(DEFINED ENV{CPPFLAGS}) IF(DEFINED ENV{CPPFLAGS})
...@@ -433,7 +435,6 @@ CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/include/mysql_version.h.in ...@@ -433,7 +435,6 @@ CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/include/mysql_version.h.in
CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/sql/sql_builtin.cc.in CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/sql/sql_builtin.cc.in
${CMAKE_BINARY_DIR}/sql/sql_builtin.cc) ${CMAKE_BINARY_DIR}/sql/sql_builtin.cc)
FIND_PACKAGE(Git)
IF(GIT_EXECUTABLE) IF(GIT_EXECUTABLE)
EXECUTE_PROCESS( EXECUTE_PROCESS(
COMMAND ${GIT_EXECUTABLE} rev-parse HEAD COMMAND ${GIT_EXECUTABLE} rev-parse HEAD
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment