diff options
author | Sergei Golubchik <serg@mariadb.org> | 2017-09-23 11:40:12 +0200 |
---|---|---|
committer | Sergei Golubchik <serg@mariadb.org> | 2017-09-23 20:21:44 +0200 |
commit | b75ca7e08683c5e6fff6f7fa56e08beb0be6bf8f (patch) | |
tree | bb97929f08b35c16adde0a7f2f742279c0c97be0 /CMakeLists.txt | |
parent | d1d3aff985a942e53e3fc11bbd34751bfec3eddd (diff) | |
download | mariadb-git-b75ca7e08683c5e6fff6f7fa56e08beb0be6bf8f.tar.gz |
cleanup: remove a duplicate check for GIT_EXECUTABLE
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r-- | CMakeLists.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index a0b498b27e3..e3a53d76eac 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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}) @@ -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 |