Merge branch '10.3' into 10.4

ad0f0d2b · Vicențiu Ciorbaru · 3c9d03ed · 13f0e1e1 · ad0f0d2b
Commit ad0f0d2b authored Feb 23, 2021 by Vicențiu Ciorbaru
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 0 deletions

cmake/make_dist.cmake.in cmake/make_dist.cmake.in +7 -0

No files found.
--- 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