mirror of
https://github.com/fergalmoran/ladybird.git
synced 2025-12-22 09:19:03 +00:00
DevContainer: Update path to vcpkg
This commit is contained in:
committed by
Andrew Kaster
parent
f9df95af50
commit
7ae7b9b695
@@ -18,20 +18,20 @@ python3 ./Toolchain/BuildVcpkg.py
|
|||||||
|
|
||||||
# Install the vcpkg.json in manifest mode from the root of the repo
|
# 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
|
# 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"
|
export VCPKG_BINARY_SOURCES="clear;files,${CACHE_DIR},readwrite"
|
||||||
|
|
||||||
# Check options to see which versions we should build
|
# Check options to see which versions we should build
|
||||||
if [ "${RELEASE_TRIPLET}" = "true" ]; then
|
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
|
fi
|
||||||
|
|
||||||
if [ "${DEBUG_TRIPLET}" = "true" ]; then
|
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
|
fi
|
||||||
|
|
||||||
if [ "${SANITIZER_TRIPLET}" = "true" ]; then
|
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
|
fi
|
||||||
|
|
||||||
# Clean up to reduce layer size
|
# Clean up to reduce layer size
|
||||||
|
|||||||
Reference in New Issue
Block a user