Browse Source

cmake .git warning

only run git if .git exists, don't do it for source tarballs
pull/823/merge
Sergei Golubchik 7 years ago
parent
commit
8ca2219065
  1. 2
      CMakeLists.txt
  2. 2
      libmariadb
  3. 2
      storage/rocksdb/CMakeLists.txt

2
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}

2
libmariadb

@ -1 +1 @@
Subproject commit ed5921ed4f26407ff1ff0596f2c74c8d7098632d
Subproject commit 463211f4a9e68eb7a2fd7a8a3466e5bf3a13e361

2
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

Loading…
Cancel
Save