Mirrors/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2026-01-18 01:11:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

support VS 2026 generators (#48269)

Browse Source
This commit is contained in:
Igor Kostenko
2025-11-15 03:59:20 +00:00
committed by GitHub
parent dce593dde6
commit 8d1151a58b
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/buildsystems/vcpkg.cmake
View File

@@ -268,6 +268,10 @@ else()
set(Z_VCPKG_TARGET_TRIPLET_ARCH arm64)
elseif(CMAKE_GENERATOR STREQUAL "Visual Studio 17 2022")
set(Z_VCPKG_TARGET_TRIPLET_ARCH x64)
elseif(CMAKE_GENERATOR STREQUAL "Visual Studio 18 2026" AND CMAKE_VS_PLATFORM_NAME_DEFAULT STREQUAL "ARM64")
set(Z_VCPKG_TARGET_TRIPLET_ARCH arm64)
elseif(CMAKE_GENERATOR STREQUAL "Visual Studio 18 2026")
set(Z_VCPKG_TARGET_TRIPLET_ARCH x64)
elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin" AND DEFINED CMAKE_OSX_ARCHITECTURES)
list(LENGTH CMAKE_OSX_ARCHITECTURES Z_VCPKG_OSX_ARCH_COUNT)
if(Z_VCPKG_OSX_ARCH_COUNT EQUAL "0")

2
scripts/cmake/vcpkg_configure_cmake.cmake
View File

@@ -42,6 +42,8 @@ function(z_vcpkg_get_visual_studio_generator)
set(generator "Visual Studio 16 2019")
elseif("$ENV{VisualStudioVersion}" VERSION_LESS_EQUAL "17.99")
set(generator "Visual Studio 17 2022")
elseif("$ENV{VisualStudioVersion}" VERSION_LESS_EQUAL "18.99")
set(generator "Visual Studio 18 2026")
endif()
endif()