From 8e716daa3d25d81d92c9e0fde4bcc93cc89a9a3d Mon Sep 17 00:00:00 2001 From: Andrew Kaster Date: Sat, 12 Oct 2024 21:57:53 -0600 Subject: [PATCH] CMake: Allow developers to append VCPKG_BINARY_SOURCES This enables adding extra binary caches, which will be useful for devcontainers. --- CMakePresets.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakePresets.json b/CMakePresets.json index 250ef8fbbe5..6f20cc4885f 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -14,14 +14,14 @@ "cacheVariables": { "CMAKE_BUILD_TYPE": "RelWithDebInfo", "SERENITY_CACHE_DIR": "${fileDir}/Build/caches", - "CMAKE_TOOLCHAIN_FILE": "${fileDir}/Toolchain/Tarballs/vcpkg/scripts/buildsystems/vcpkg.cmake", + "CMAKE_TOOLCHAIN_FILE": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake", "VCPKG_INSTALL_OPTIONS": "--no-print-usage", "VCPKG_OVERLAY_TRIPLETS": "${fileDir}/Meta/CMake/vcpkg/release-triplets" }, "environment": { "LADYBIRD_SOURCE_DIR": "${fileDir}", "VCPKG_ROOT": "${fileDir}/Toolchain/Tarballs/vcpkg", - "VCPKG_BINARY_SOURCES": "clear;files,${fileDir}/Toolchain/Build/vcpkg-binary-cache,readwrite" + "VCPKG_BINARY_SOURCES": "clear;files,${fileDir}/Toolchain/Build/vcpkg-binary-cache,readwrite;$penv{VCPKG_BINARY_SOURCES}" }, "vendor": { "jetbrains.com/clion": {