diff --git a/scripts/cmake/MarkVariablesAdvanced.cmake b/scripts/cmake/MarkVariablesAdvanced.cmake index 96bca7390d2a64ce81d672969d7d71f428041f46..c1bf5d4fa3ef3c255cc2ef2daa0c4f6379c2a53f 100644 --- a/scripts/cmake/MarkVariablesAdvanced.cmake +++ b/scripts/cmake/MarkVariablesAdvanced.cmake @@ -21,7 +21,6 @@ mark_as_advanced( DIFF_TOOL_PATH EIGEN_NO_DEBUG EIGEN3_FOUND - GIT_TOOL_PATH GPROF_PATH GREP_TOOL_PATH HOSTNAME diff --git a/scripts/cmake/PreFind.cmake b/scripts/cmake/PreFind.cmake index 10ab88fd1f48c8e74baa15702d9fba72ae2aa709..b4ae3a14c15e1ffb7bc0922009d703e3498cf1c0 100644 --- a/scripts/cmake/PreFind.cmake +++ b/scripts/cmake/PreFind.cmake @@ -9,7 +9,6 @@ find_program(GIT_EXECUTABLE find_package(Git REQUIRED) string(REPLACE "mingw64/" "" GIT_EXECUTABLE ${GIT_EXECUTABLE}) # Windows git submodule fix -set(GIT_TOOL_PATH ${GIT_EXECUTABLE} CACHE FILEPATH "The git command line interface" FORCE) ### End Find Git execute_process(COMMAND ${GIT_EXECUTABLE} status diff --git a/scripts/cmake/SubmoduleSetup.cmake b/scripts/cmake/SubmoduleSetup.cmake index cb64ecd4dcd7d71280e71d2802f430090da9cf20..be0d9d3297437a84a1239fe236b2ba67487805fc 100644 --- a/scripts/cmake/SubmoduleSetup.cmake +++ b/scripts/cmake/SubmoduleSetup.cmake @@ -33,14 +33,14 @@ endif() # Sync submodules, which is required when a submodule changed its URL if(OGS_SYNC_SUBMODULES) execute_process( - COMMAND ${GIT_TOOL_PATH} submodule sync + COMMAND ${GIT_EXECUTABLE} submodule sync WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} OUTPUT_QUIET ) endif() foreach(SUBMODULE ${REQUIRED_SUBMODULES}) execute_process( - COMMAND ${GIT_TOOL_PATH} submodule status ${SUBMODULE} + COMMAND ${GIT_EXECUTABLE} submodule status ${SUBMODULE} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} OUTPUT_VARIABLE SUBMODULE_STATE ) @@ -50,7 +50,7 @@ foreach(SUBMODULE ${REQUIRED_SUBMODULES}) if(IS_CI) # Always set submodule to the given state execute_process( - COMMAND ${GIT_TOOL_PATH} submodule update --init --force + COMMAND ${GIT_EXECUTABLE} submodule update --init --force --recursive ${DEPTH} ${SUBMODULE} WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} RESULT_VARIABLE RESULT @@ -60,7 +60,7 @@ foreach(SUBMODULE ${REQUIRED_SUBMODULES}) if(UNINITIALIZED) message(STATUS "Initializing submodule ${SUBMODULE}") execute_process( - COMMAND ${GIT_TOOL_PATH} submodule update --init + COMMAND ${GIT_EXECUTABLE} submodule update --init --recursive ${DEPTH} ${SUBMODULE} WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} RESULT_VARIABLE RESULT @@ -69,7 +69,7 @@ foreach(SUBMODULE ${REQUIRED_SUBMODULES}) elseif(MISMATCH) message(STATUS "Updating submodule ${SUBMODULE}") execute_process( - COMMAND ${GIT_TOOL_PATH} submodule update + COMMAND ${GIT_EXECUTABLE} submodule update --recursive ${SUBMODULE} WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} RESULT_VARIABLE RESULT