From 7ae7b9b695b498447a6f32b9019b132ec74e0c84 Mon Sep 17 00:00:00 2001 From: Andrew Kaster Date: Fri, 8 Nov 2024 11:21:48 -0700 Subject: [PATCH] DevContainer: Update path to vcpkg --- .devcontainer/features/vcpkg-cache/install.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.devcontainer/features/vcpkg-cache/install.sh b/.devcontainer/features/vcpkg-cache/install.sh index 71bf8952344..c50155d5c47 100644 --- a/.devcontainer/features/vcpkg-cache/install.sh +++ b/.devcontainer/features/vcpkg-cache/install.sh @@ -18,20 +18,20 @@ python3 ./Toolchain/BuildVcpkg.py # Install the vcpkg.json in manifest mode from the root of the repo # Set the binary cache directory to the one we intend to use at container runtime -export VCPKG_ROOT="${PWD}/Toolchain/Tarballs/vcpkg" +export VCPKG_ROOT="${PWD}/Build/vcpkg" export VCPKG_BINARY_SOURCES="clear;files,${CACHE_DIR},readwrite" # Check options to see which versions we should build if [ "${RELEASE_TRIPLET}" = "true" ]; then - ./Toolchain/Local/vcpkg/bin/vcpkg install --overlay-triplets="${PWD}/Meta/CMake/vcpkg/release-triplets" + "./${VCPKG_ROOT}/vcpkg" install --overlay-triplets="${PWD}/Meta/CMake/vcpkg/release-triplets" fi if [ "${DEBUG_TRIPLET}" = "true" ]; then - ./Toolchain/Local/vcpkg/bin/vcpkg install --overlay-triplets="${PWD}/Meta/CMake/vcpkg/debug-triplets" + "./${VCPKG_ROOT}/vcpkg" install --overlay-triplets="${PWD}/Meta/CMake/vcpkg/debug-triplets" fi if [ "${SANITIZER_TRIPLET}" = "true" ]; then - ./Toolchain/Local/vcpkg/bin/vcpkg install --overlay-triplets="${PWD}/Meta/CMake/vcpkg/sanitizer-triplets" + "./${VCPKG_ROOT}/vcpkg" install --overlay-triplets="${PWD}/Meta/CMake/vcpkg/sanitizer-triplets" fi # Clean up to reduce layer size