Skip to content

Commit

Permalink
DevContainer: Update path to vcpkg
Browse files Browse the repository at this point in the history
  • Loading branch information
ADKaster committed Nov 8, 2024
1 parent f9df95a commit 7ae7b9b
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions .devcontainer/features/vcpkg-cache/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 7ae7b9b

Please sign in to comment.