cmake .git warning

only run git if .git exists, don't do it for source tarballs

cmake .git warning
only run git if .git exists, don't do it for source tarballs
8ca22190 · Sergei Golubchik · 675e7e7d · 8ca22190 · 463211f4 · 8ca22190
Commit 8ca22190 authored Jul 04, 2018 by Sergei Golubchik
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

CMakeLists.txt CMakeLists.txt +1 -1

libmariadb libmariadb +1 -1

storage/rocksdb/CMakeLists.txt storage/rocksdb/CMakeLists.txt +1 -1

No files found.
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -439,7 +439,7 @@ 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)
-IF(GIT_EXECUTABLE)
+IF(GIT_EXECUTABLE AND EXISTS ${PROJECT_SOURCE_DIR}/.git)
  EXECUTE_PROCESS(
    COMMAND ${GIT_EXECUTABLE} rev-parse HEAD
      WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}

--- a/libmariadb @ 463211f4
+++ b/libmariadb @ 463211f4
-Subproject commit ed5921ed4f26407ff1ff0596f2c74c8d7098632d
+Subproject commit 463211f4a9e68eb7a2fd7a8a3466e5bf3a13e361
--- a/storage/rocksdb/CMakeLists.txt
+++ b/storage/rocksdb/CMakeLists.txt
@@ -241,7 +241,7 @@ IF (ZSTD_FOUND)
  SET(WITH_ZSTD ON)
 ENDIF()
-IF(GIT_EXECUTABLE)
+IF(GIT_EXECUTABLE AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/rocksdb/.git)
  EXECUTE_PROCESS(
    COMMAND ${GIT_EXECUTABLE} rev-parse HEAD
      WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/rocksdb