diff options
| author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2021-02-23 21:43:05 +0200 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2021-02-23 21:43:05 +0200 |
| commit | 13f0e1e1392b1e275d55a7d37b3dac946d908bb0 (patch) | |
| tree | 88fafb5ec414e1faac0c3bbad6c6fd0c27b704ab /cmake | |
| parent | 69bf55ffb6c38f802bf6ed4d9f97c90225835eab (diff) | |
| parent | 9e259d58c2a898800463d28b175fde0e74ab96d9 (diff) | |
| download | mariadb-git-13f0e1e1392b1e275d55a7d37b3dac946d908bb0.tar.gz | |
Merge branch '10.2' into 10.3
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 a3de8a7d4e5..75691f944d6 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 |