Skip to content

Commit 1eadc31

Browse files
authored
Merge pull request #53 from cpp-best-practices/vcpkg-git
2 parents 0d3e8a2 + 61640df commit 1eadc31

1 file changed

Lines changed: 10 additions & 2 deletions

File tree

src/Vcpkg.cmake

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,17 @@ macro(run_vcpkg)
4545
if("${_vcpkg_args_VCPKG_URL}" STREQUAL "")
4646
set(_vcpkg_args_VCPKG_URL "https://github.com/microsoft/vcpkg.git")
4747
endif()
48-
execute_process(COMMAND "git" "clone" "${_vcpkg_args_VCPKG_URL}" WORKING_DIRECTORY ${VCPKG_PARENT_DIR})
48+
find_program(GIT_EXECUTABLE "git" REQUIRED)
49+
execute_process(COMMAND "${GIT_EXECUTABLE}" "clone" "${_vcpkg_args_VCPKG_URL}"
50+
WORKING_DIRECTORY ${VCPKG_PARENT_DIR})
4951
# Run vcpkg bootstrap
50-
execute_process(COMMAND "./vcpkg/bootstrap-vcpkg" WORKING_DIRECTORY "${_vcpkg_args_VCPKG_DIR}")
52+
if(WIN32)
53+
execute_process(COMMAND "./vcpkg/bootstrap-vcpkg.bat" "-disableMetrics"
54+
WORKING_DIRECTORY "${_vcpkg_args_VCPKG_DIR}")
55+
else()
56+
execute_process(COMMAND "./vcpkg/bootstrap-vcpkg.sh" "-disableMetrics"
57+
WORKING_DIRECTORY "${_vcpkg_args_VCPKG_DIR}")
58+
endif()
5159
endif()
5260

5361
# Setting up vcpkg toolchain

0 commit comments

Comments
 (0)