Skip to content

Commit

Permalink
cleanup: remove a duplicate check for GIT_EXECUTABLE
Browse files Browse the repository at this point in the history
  • Loading branch information
vuvova committed Sep 23, 2017
1 parent d1d3aff commit b75ca7e
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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})
Expand Down Expand Up @@ -433,7 +435,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
Expand Down

0 comments on commit b75ca7e

Please sign in to comment.