File tree 1 file changed +3
-3
lines changed
1 file changed +3
-3
lines changed Original file line number Diff line number Diff line change @@ -65,9 +65,9 @@ if(USE_VCPKG)
65
65
set (VCPKG_DIR "${CMAKE_SOURCE_DIR} /compat/vcbuild/vcpkg" )
66
66
if (NOT EXISTS ${VCPKG_DIR} )
67
67
message ("Initializing vcpkg and building the Git's dependencies (this will take a while...)" )
68
- execute_process (COMMAND ${CMAKE_SOURCE_DIR} /compat/vcbuild/vcpkg_install.bat)
68
+ execute_process (COMMAND ${CMAKE_SOURCE_DIR} /compat/vcbuild/vcpkg_install.bat ${VCPKG_ARCH} )
69
69
endif ()
70
- list (APPEND CMAKE_PREFIX_PATH "${VCPKG_DIR} /installed/x64-windows " )
70
+ list (APPEND CMAKE_PREFIX_PATH "${VCPKG_DIR} /installed/${VCPKG_ARCH} " )
71
71
72
72
# In the vcpkg edition, we need this to be able to link to libcurl
73
73
set (CURL_NO_CURL_CMAKE ON )
@@ -1207,7 +1207,7 @@ string(REPLACE "@USE_GETTEXT_SCHEME@" "" git_build_options "${git_build_options}
1207
1207
string (REPLACE "@USE_LIBPCRE2@" "" git_build_options "${git_build_options} " )
1208
1208
string (REPLACE "@X@" "${EXE_EXTENSION} " git_build_options "${git_build_options} " )
1209
1209
if (USE_VCPKG)
1210
- string (APPEND git_build_options "PATH=\" $PATH:$TEST_DIRECTORY/../compat/vcbuild/vcpkg/installed/x64-windows /bin\"\n " )
1210
+ string (APPEND git_build_options "PATH=\" $PATH:$TEST_DIRECTORY/../compat/vcbuild/vcpkg/installed/${VCPKG_ARCH} /bin\"\n " )
1211
1211
endif ()
1212
1212
file (WRITE ${CMAKE_BINARY_DIR} /GIT-BUILD -OPTIONS ${git_build_options} )
1213
1213
You can’t perform that action at this time.
0 commit comments