mirror of
https://github.com/microsoft/terminal.git
synced 2026-02-03 18:17:40 -06:00
Set the vcpkg toolset to v143 (#19720)
This fixes building with the latest VS2026, but it's probably a good idea regardless.
This commit is contained in:
parent
d05dd85275
commit
3c2eb594a5
8
dep/vcpkg-overlay-triplets/arm64-windows-static.cmake
Normal file
8
dep/vcpkg-overlay-triplets/arm64-windows-static.cmake
Normal file
@ -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)
|
||||||
@ -1,6 +1,11 @@
|
|||||||
|
# Same as the official arm64-windows-static triplet
|
||||||
set(VCPKG_TARGET_ARCHITECTURE arm64)
|
set(VCPKG_TARGET_ARCHITECTURE arm64)
|
||||||
set(VCPKG_CRT_LINKAGE static)
|
set(VCPKG_CRT_LINKAGE static)
|
||||||
set(VCPKG_LIBRARY_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_CXX_FLAGS /fsanitize=address)
|
||||||
set(VCPKG_C_FLAGS /fsanitize=address)
|
set(VCPKG_C_FLAGS /fsanitize=address)
|
||||||
|
|||||||
@ -1,6 +1,11 @@
|
|||||||
|
# Same as the official x64-windows-static triplet
|
||||||
set(VCPKG_TARGET_ARCHITECTURE x64)
|
set(VCPKG_TARGET_ARCHITECTURE x64)
|
||||||
set(VCPKG_CRT_LINKAGE static)
|
set(VCPKG_CRT_LINKAGE static)
|
||||||
set(VCPKG_LIBRARY_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_CXX_FLAGS /fsanitize=address)
|
||||||
set(VCPKG_C_FLAGS /fsanitize=address)
|
set(VCPKG_C_FLAGS /fsanitize=address)
|
||||||
|
|||||||
@ -1,6 +1,11 @@
|
|||||||
|
# Same as the official x86-windows-static triplet
|
||||||
set(VCPKG_TARGET_ARCHITECTURE x86)
|
set(VCPKG_TARGET_ARCHITECTURE x86)
|
||||||
set(VCPKG_CRT_LINKAGE static)
|
set(VCPKG_CRT_LINKAGE static)
|
||||||
set(VCPKG_LIBRARY_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_CXX_FLAGS /fsanitize=address)
|
||||||
set(VCPKG_C_FLAGS /fsanitize=address)
|
set(VCPKG_C_FLAGS /fsanitize=address)
|
||||||
|
|||||||
8
dep/vcpkg-overlay-triplets/x64-windows-static.cmake
Normal file
8
dep/vcpkg-overlay-triplets/x64-windows-static.cmake
Normal file
@ -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)
|
||||||
8
dep/vcpkg-overlay-triplets/x86-windows-static.cmake
Normal file
8
dep/vcpkg-overlay-triplets/x86-windows-static.cmake
Normal file
@ -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)
|
||||||
@ -38,6 +38,11 @@
|
|||||||
],
|
],
|
||||||
"builtin-baseline": "fe1cde61e971d53c9687cf9a46308f8f55da19fa",
|
"builtin-baseline": "fe1cde61e971d53c9687cf9a46308f8f55da19fa",
|
||||||
"vcpkg-configuration": {
|
"vcpkg-configuration": {
|
||||||
"overlay-ports": [ "./dep/vcpkg-overlay-ports" ]
|
"overlay-triplets": [
|
||||||
|
"./dep/vcpkg-overlay-triplets"
|
||||||
|
],
|
||||||
|
"overlay-ports": [
|
||||||
|
"./dep/vcpkg-overlay-ports"
|
||||||
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user