diff options
| author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2021-02-23 21:44:22 +0200 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2021-02-23 21:44:22 +0200 |
| commit | ad0f0d2b1a037c1774bc0aecc8ed1e7cf1847e55 (patch) | |
| tree | f036f423a3a2e45ac020fbc2d0870f34fcaee255 /cmake | |
| parent | 3c9d03eddaf9a928bf8391a1265df322c7404d88 (diff) | |
| parent | 13f0e1e1392b1e275d55a7d37b3dac946d908bb0 (diff) | |
| download | mariadb-git-ad0f0d2b1a037c1774bc0aecc8ed1e7cf1847e55.tar.gz | |
Merge branch '10.3' into 10.4
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/make_dist.cmake.in | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/cmake/make_dist.cmake.in b/cmake/make_dist.cmake.in index f471c6e53d0..d662dd76730 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 |