From 47873ff36e48082bbfe71c4585f0b7d94853b4a1 Mon Sep 17 00:00:00 2001 From: Tal Regev Date: Fri, 17 Mar 2023 17:42:46 +0200 Subject: [PATCH] Add vcpkg link also for windows --- 3rdParty/vcpkg_ports/vcpkg_link.bat | 2 ++ 3rdParty/vcpkg_ports/vcpkg_link.sh | 3 ++- win_build/vcpkg_3rdparty_dependencies.vcxproj | 5 ++++- windows/bootstrap_vcpkg_cmake.bat | 3 ++- 4 files changed, 10 insertions(+), 3 deletions(-) create mode 100644 3rdParty/vcpkg_ports/vcpkg_link.bat mode change 100644 => 100755 3rdParty/vcpkg_ports/vcpkg_link.sh diff --git a/3rdParty/vcpkg_ports/vcpkg_link.bat b/3rdParty/vcpkg_ports/vcpkg_link.bat new file mode 100644 index 0000000000..bf74e8d56e --- /dev/null +++ b/3rdParty/vcpkg_ports/vcpkg_link.bat @@ -0,0 +1,2 @@ +set VCPKG_LINK=https://github.com/microsoft/vcpkg +echo %VCPKG_LINK% diff --git a/3rdParty/vcpkg_ports/vcpkg_link.sh b/3rdParty/vcpkg_ports/vcpkg_link.sh old mode 100644 new mode 100755 index ff549af483..23f2664c62 --- a/3rdParty/vcpkg_ports/vcpkg_link.sh +++ b/3rdParty/vcpkg_ports/vcpkg_link.sh @@ -1,3 +1,4 @@ #!/bin/sh -export VCPKG_LINK=https://github.com/microsoft/vcpkg +export VCPKG_LINK="https://github.com/microsoft/vcpkg" +echo $VCPKG_LINK diff --git a/win_build/vcpkg_3rdparty_dependencies.vcxproj b/win_build/vcpkg_3rdparty_dependencies.vcxproj index 658df223fd..a7ef094bd0 100644 --- a/win_build/vcpkg_3rdparty_dependencies.vcxproj +++ b/win_build/vcpkg_3rdparty_dependencies.vcxproj @@ -171,7 +171,10 @@ - + + + + diff --git a/windows/bootstrap_vcpkg_cmake.bat b/windows/bootstrap_vcpkg_cmake.bat index c515a41f94..6bcdb3c45f 100644 --- a/windows/bootstrap_vcpkg_cmake.bat +++ b/windows/bootstrap_vcpkg_cmake.bat @@ -9,10 +9,11 @@ set "BUILD_DIR=%CD%\3rdParty\Windows" set "VCPKG_PORTS=%CD%\3rdParty\vcpkg_ports" set "VCPKG_ROOT=%BUILD_DIR%\vcpkg" +call "%CD%\3rdParty\vcpkg_ports\vcpkg_link.bat" if not exist "%VCPKG_ROOT%" ( mkdir -p "%VCPKG_ROOT%" - git -C %BUILD_DIR% clone https://github.com/microsoft/vcpkg + git -C %BUILD_DIR% clone %VCPKG_LINK% )