diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-09-25 22:05:56 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-09-25 22:05:56 +0300 |
| commit | 4a32e2395e1ff6cf7274d0567282b1747031108b (patch) | |
| tree | f20565057eebcd25fda9292e66695bbf8a409f41 /CMakeLists.txt | |
| parent | b773270c397a97425abc506e7d7fbc5fedb99d9c (diff) | |
| parent | 86c3ba65aa39e1e81c52f3455a1bcf187906dffc (diff) | |
| download | mariadb-git-4a32e2395e1ff6cf7274d0567282b1747031108b.tar.gz | |
Merge bb-10.2-ext into 10.3
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 aefc6711fbc..b16105a710b 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}) @@ -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 |