@@ -15,6 +15,8 @@ macro(run_vcpkg)
1515 ""
1616 ${ARGN} )
1717
18+ find_program (GIT_EXECUTABLE "git" REQUIRED)
19+
1820 if (NOT
1921 "${_vcpkg_args_VCPKG_DIR} "
2022 STREQUAL
@@ -47,18 +49,18 @@ macro(run_vcpkg)
4749 # detect if the head is detached, if so, switch back before calling git pull on a detached head
4850 set (GIT_STATUS "" )
4951 execute_process (
50- COMMAND "git " "rev-parse" "--abbrev-ref" "--symbolic-full-name" "HEAD"
52+ COMMAND "${GIT_EXECUTABLE} " "rev-parse" "--abbrev-ref" "--symbolic-full-name" "HEAD"
5153 OUTPUT_VARIABLE GIT_STATUS
5254 WORKING_DIRECTORY "${_vcpkg_args_VCPKG_DIR} "
5355 OUTPUT_STRIP_TRAILING_WHITESPACE)
5456 if ("${GIT_STATUS} " STREQUAL "HEAD" )
5557 message (STATUS "Switching back before updating" )
56- execute_process (COMMAND "git " "switch" "-" WORKING_DIRECTORY "${_vcpkg_args_VCPKG_DIR} " )
58+ execute_process (COMMAND "${GIT_EXECUTABLE} " "switch" "-" WORKING_DIRECTORY "${_vcpkg_args_VCPKG_DIR} " )
5759 endif ()
5860 endif ()
5961
6062 message (STATUS "Updating the repository..." )
61- execute_process (COMMAND "git " "pull" WORKING_DIRECTORY "${_vcpkg_args_VCPKG_DIR} " )
63+ execute_process (COMMAND "${GIT_EXECUTABLE} " "pull" WORKING_DIRECTORY "${_vcpkg_args_VCPKG_DIR} " )
6264 endif ()
6365 else ()
6466 message (STATUS "Installing vcpkg at ${_vcpkg_args_VCPKG_DIR} " )
@@ -67,7 +69,6 @@ macro(run_vcpkg)
6769 if ("${_vcpkg_args_VCPKG_URL} " STREQUAL "" )
6870 set (_vcpkg_args_VCPKG_URL "https://github.com/microsoft/vcpkg.git" )
6971 endif ()
70- find_program (GIT_EXECUTABLE "git" REQUIRED)
7172 execute_process (COMMAND "${GIT_EXECUTABLE} " "clone" "${_vcpkg_args_VCPKG_URL} "
7273 WORKING_DIRECTORY "${VCPKG_PARENT_DIR} " COMMAND_ERROR_IS_FATAL LAST)
7374 endif ()
@@ -85,7 +86,6 @@ macro(run_vcpkg)
8586 "${_vcpkg_args_VCPKG_REV} "
8687 STREQUAL
8788 "" )
88- find_program (GIT_EXECUTABLE "git" REQUIRED)
8989 execute_process (COMMAND "${GIT_EXECUTABLE} " "checkout" "${_vcpkg_args_VCPKG_REV} "
9090 WORKING_DIRECTORY "${VCPKG_PARENT_DIR} /vcpkg" COMMAND_ERROR_IS_FATAL LAST)
9191 endif ()
0 commit comments