From 3c2eb594a515e4f42625813169590c117d535c41 Mon Sep 17 00:00:00 2001 From: Leonard Hecker Date: Thu, 8 Jan 2026 03:27:18 +0100 Subject: [PATCH] Set the vcpkg toolset to v143 (#19720) This fixes building with the latest VS2026, but it's probably a good idea regardless. --- dep/vcpkg-overlay-triplets/arm64-windows-static.cmake | 8 ++++++++ .../fuzzing/arm64-windows-static.cmake | 5 +++++ .../fuzzing/x64-windows-static.cmake | 5 +++++ .../fuzzing/x86-windows-static.cmake | 5 +++++ dep/vcpkg-overlay-triplets/x64-windows-static.cmake | 8 ++++++++ dep/vcpkg-overlay-triplets/x86-windows-static.cmake | 8 ++++++++ vcpkg.json | 7 ++++++- 7 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 dep/vcpkg-overlay-triplets/arm64-windows-static.cmake create mode 100644 dep/vcpkg-overlay-triplets/x64-windows-static.cmake create mode 100644 dep/vcpkg-overlay-triplets/x86-windows-static.cmake diff --git a/dep/vcpkg-overlay-triplets/arm64-windows-static.cmake b/dep/vcpkg-overlay-triplets/arm64-windows-static.cmake new file mode 100644 index 0000000000..37b85c3e0c --- /dev/null +++ b/dep/vcpkg-overlay-triplets/arm64-windows-static.cmake @@ -0,0 +1,8 @@ +# Same as the official arm64-windows-static triplet +set(VCPKG_TARGET_ARCHITECTURE arm64) +set(VCPKG_CRT_LINKAGE static) +set(VCPKG_LIBRARY_LINKAGE static) + +# ...but with explicit platform toolset, so that future toolsets +# aren't automatically picked up (it defaults to the latest one). +set(VCPKG_PLATFORM_TOOLSET v143) diff --git a/dep/vcpkg-overlay-triplets/fuzzing/arm64-windows-static.cmake b/dep/vcpkg-overlay-triplets/fuzzing/arm64-windows-static.cmake index 41bcac2329..9f2c8d0a13 100644 --- a/dep/vcpkg-overlay-triplets/fuzzing/arm64-windows-static.cmake +++ b/dep/vcpkg-overlay-triplets/fuzzing/arm64-windows-static.cmake @@ -1,6 +1,11 @@ +# Same as the official arm64-windows-static triplet set(VCPKG_TARGET_ARCHITECTURE arm64) set(VCPKG_CRT_LINKAGE static) set(VCPKG_LIBRARY_LINKAGE static) +# ...but with explicit platform toolset, so that future toolsets +# aren't automatically picked up (it defaults to the latest one). +set(VCPKG_PLATFORM_TOOLSET v143) + set(VCPKG_CXX_FLAGS /fsanitize=address) set(VCPKG_C_FLAGS /fsanitize=address) diff --git a/dep/vcpkg-overlay-triplets/fuzzing/x64-windows-static.cmake b/dep/vcpkg-overlay-triplets/fuzzing/x64-windows-static.cmake index 909e747923..7b3aeea850 100644 --- a/dep/vcpkg-overlay-triplets/fuzzing/x64-windows-static.cmake +++ b/dep/vcpkg-overlay-triplets/fuzzing/x64-windows-static.cmake @@ -1,6 +1,11 @@ +# Same as the official x64-windows-static triplet set(VCPKG_TARGET_ARCHITECTURE x64) set(VCPKG_CRT_LINKAGE static) set(VCPKG_LIBRARY_LINKAGE static) +# ...but with explicit platform toolset, so that future toolsets +# aren't automatically picked up (it defaults to the latest one). +set(VCPKG_PLATFORM_TOOLSET v143) + set(VCPKG_CXX_FLAGS /fsanitize=address) set(VCPKG_C_FLAGS /fsanitize=address) diff --git a/dep/vcpkg-overlay-triplets/fuzzing/x86-windows-static.cmake b/dep/vcpkg-overlay-triplets/fuzzing/x86-windows-static.cmake index 60a3c5e9cb..9e6a72cdff 100644 --- a/dep/vcpkg-overlay-triplets/fuzzing/x86-windows-static.cmake +++ b/dep/vcpkg-overlay-triplets/fuzzing/x86-windows-static.cmake @@ -1,6 +1,11 @@ +# Same as the official x86-windows-static triplet set(VCPKG_TARGET_ARCHITECTURE x86) set(VCPKG_CRT_LINKAGE static) set(VCPKG_LIBRARY_LINKAGE static) +# ...but with explicit platform toolset, so that future toolsets +# aren't automatically picked up (it defaults to the latest one). +set(VCPKG_PLATFORM_TOOLSET v143) + set(VCPKG_CXX_FLAGS /fsanitize=address) set(VCPKG_C_FLAGS /fsanitize=address) diff --git a/dep/vcpkg-overlay-triplets/x64-windows-static.cmake b/dep/vcpkg-overlay-triplets/x64-windows-static.cmake new file mode 100644 index 0000000000..12e0256ddf --- /dev/null +++ b/dep/vcpkg-overlay-triplets/x64-windows-static.cmake @@ -0,0 +1,8 @@ +# Same as the official x64-windows-static triplet +set(VCPKG_TARGET_ARCHITECTURE x64) +set(VCPKG_CRT_LINKAGE static) +set(VCPKG_LIBRARY_LINKAGE static) + +# ...but with explicit platform toolset, so that future toolsets +# aren't automatically picked up (it defaults to the latest one). +set(VCPKG_PLATFORM_TOOLSET v143) diff --git a/dep/vcpkg-overlay-triplets/x86-windows-static.cmake b/dep/vcpkg-overlay-triplets/x86-windows-static.cmake new file mode 100644 index 0000000000..45869c1dd3 --- /dev/null +++ b/dep/vcpkg-overlay-triplets/x86-windows-static.cmake @@ -0,0 +1,8 @@ +# Same as the official x86-windows-static triplet +set(VCPKG_TARGET_ARCHITECTURE x86) +set(VCPKG_CRT_LINKAGE static) +set(VCPKG_LIBRARY_LINKAGE static) + +# ...but with explicit platform toolset, so that future toolsets +# aren't automatically picked up (it defaults to the latest one). +set(VCPKG_PLATFORM_TOOLSET v143) diff --git a/vcpkg.json b/vcpkg.json index 28b1d753e4..95a35e67a2 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -38,6 +38,11 @@ ], "builtin-baseline": "fe1cde61e971d53c9687cf9a46308f8f55da19fa", "vcpkg-configuration": { - "overlay-ports": [ "./dep/vcpkg-overlay-ports" ] + "overlay-triplets": [ + "./dep/vcpkg-overlay-triplets" + ], + "overlay-ports": [ + "./dep/vcpkg-overlay-ports" + ] } }