summaryrefslogtreecommitdiff
path: root/cmake/make_dist.cmake.in
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2021-02-24 08:54:44 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2021-02-24 08:54:44 +0200
commitf159061510c229893a88cb2bc1c520241465b172 (patch)
tree2e1f007d9d273a0d3ca8f4746b152fe823241621 /cmake/make_dist.cmake.in
parentf33e57a9e66f7e1790cb84b141381bb668e281a0 (diff)
parentad0f0d2b1a037c1774bc0aecc8ed1e7cf1847e55 (diff)
downloadmariadb-git-f159061510c229893a88cb2bc1c520241465b172.tar.gz
Merge 10.4 into 10.5
Diffstat (limited to 'cmake/make_dist.cmake.in')
-rw-r--r--cmake/make_dist.cmake.in7
1 files changed, 7 insertions, 0 deletions
diff --git a/cmake/make_dist.cmake.in b/cmake/make_dist.cmake.in
index 941b64c811f..9e9eb555951 100644
--- a/cmake/make_dist.cmake.in
+++ b/cmake/make_dist.cmake.in
@@ -43,6 +43,13 @@ IF(GIT_EXECUTABLE)
MESSAGE(STATUS "Running git checkout-index")
EXECUTE_PROCESS(
COMMAND "${GIT_EXECUTABLE}" checkout-index --all --prefix=${PACKAGE_DIR}/
+ WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+ RESULT_VARIABLE RESULT
+ )
+ IF(NOT RESULT EQUAL 0)
+ SET(GIT_EXECUTABLE)
+ ENDIF()
+ EXECUTE_PROCESS(
COMMAND "${GIT_EXECUTABLE}" submodule foreach "${GIT_EXECUTABLE} checkout-index --all --prefix=${PACKAGE_DIR}/$path/"
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
RESULT_VARIABLE RESULT