From 924b85c1a8df03b5a52975859ec0985e7cdc0cc7 Mon Sep 17 00:00:00 2001 From: Tal Regev Date: Wed, 15 Mar 2023 01:52:21 +0200 Subject: [PATCH] Fix: vcpkg will clone from $VCPKG_LINK --- android/bootstrap_vcpkg_cmake.sh | 3 ++- wasm/update_emsdk_vcpkg.sh | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/android/bootstrap_vcpkg_cmake.sh b/android/bootstrap_vcpkg_cmake.sh index acf5e90cb3..9fb522469d 100755 --- a/android/bootstrap_vcpkg_cmake.sh +++ b/android/bootstrap_vcpkg_cmake.sh @@ -8,12 +8,13 @@ if [ ! -d "$PLATFORM_NAME" ]; then exit 1 fi +. $PWD/3rdParty/vcpkg_ports/vcpkg_link.sh BUILD_DIR="$PWD/3rdParty/$PLATFORM_NAME" VCPKG_ROOT="$BUILD_DIR/vcpkg" if [ ! -d $VCPKG_ROOT ]; then mkdir -p $BUILD_DIR - git -C $BUILD_DIR clone https://github.com/microsoft/vcpkg + git -C $BUILD_DIR clone $VCPKG_LINK fi git -C $VCPKG_ROOT pull diff --git a/wasm/update_emsdk_vcpkg.sh b/wasm/update_emsdk_vcpkg.sh index 654a75d84e..9a5528840f 100755 --- a/wasm/update_emsdk_vcpkg.sh +++ b/wasm/update_emsdk_vcpkg.sh @@ -6,14 +6,14 @@ if [ ! -d "wasm" ]; then exit 1 fi - +. $PWD/3rdParty/vcpkg_ports/vcpkg_link.sh BUILD_DIR="$PWD/3rdParty/wasm" VCPKG_PORTS="$PWD/3rdParty/vcpkg_ports" VCPKG_ROOT="$BUILD_DIR/vcpkg" if [ ! -d $VCPKG_ROOT ]; then mkdir -p $BUILD_DIR - git -C $BUILD_DIR clone https://github.com/microsoft/vcpkg + git -C $BUILD_DIR clone $VCPKG_LINK fi git -C $VCPKG_ROOT pull