diff options
| author | Phoebe <20694052+PhoebeHui@users.noreply.github.com> | 2021-09-14 11:10:12 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-13 20:10:12 -0700 |
| commit | c592209c5f4d537b866548b1f2cb13e296b5dfc6 (patch) | |
| tree | 846a396c15770612f086239bf1ca3a24750148ba /scripts | |
| parent | ac0605b700d8f16d03df8664b7ed8e4f3239ef76 (diff) | |
| download | vcpkg-c592209c5f4d537b866548b1f2cb13e296b5dfc6.tar.gz vcpkg-c592209c5f4d537b866548b1f2cb13e296b5dfc6.zip | |
[vcpkg_cmake_configure/vcpkg_configure_cmake] Support VS2022 17.0 (#19088)
* [vcpkg] Support VS2022 17.0
* small changes
* Update vcpkg.cmake
* Update the baseline version
* Update the baseline version
* Update the baselin version
* Adress the review suggestions
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/buildsystems/vcpkg.cmake | 2 | ||||
| -rw-r--r-- | scripts/cmake/vcpkg_configure_cmake.cmake | 12 |
2 files changed, 14 insertions, 0 deletions
diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake index b38547639..9769b6113 100644 --- a/scripts/buildsystems/vcpkg.cmake +++ b/scripts/buildsystems/vcpkg.cmake @@ -268,6 +268,8 @@ else() set(Z_VCPKG_TARGET_TRIPLET_ARCH x86) elseif(CMAKE_GENERATOR MATCHES "^Visual Studio 16 2019$") set(Z_VCPKG_TARGET_TRIPLET_ARCH x64) + elseif(CMAKE_GENERATOR MATCHES "^Visual Studio 17 2022$") + set(Z_VCPKG_TARGET_TRIPLET_ARCH x64) else() find_program(Z_VCPKG_CL cl) if(Z_VCPKG_CL MATCHES "amd64/cl.exe$" OR Z_VCPKG_CL MATCHES "x64/cl.exe$") diff --git a/scripts/cmake/vcpkg_configure_cmake.cmake b/scripts/cmake/vcpkg_configure_cmake.cmake index 0377ae5dd..1e0a1100d 100644 --- a/scripts/cmake/vcpkg_configure_cmake.cmake +++ b/scripts/cmake/vcpkg_configure_cmake.cmake @@ -187,6 +187,18 @@ function(vcpkg_configure_cmake) set(GENERATOR "Visual Studio 16 2019") set(ARCH "ARM64") + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" AND VCPKG_PLATFORM_TOOLSET STREQUAL "v143") + set(GENERATOR "Visual Studio 17 2022") + set(ARCH "Win32") + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64" AND VCPKG_PLATFORM_TOOLSET STREQUAL "v143") + set(GENERATOR "Visual Studio 17 2022") + set(ARCH "x64") + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" AND VCPKG_PLATFORM_TOOLSET STREQUAL "v143") + set(GENERATOR "Visual Studio 17 2022") + set(ARCH "ARM") + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" AND VCPKG_PLATFORM_TOOLSET STREQUAL "v143") + set(GENERATOR "Visual Studio 17 2022") + set(ARCH "ARM64") else() if(NOT VCPKG_CMAKE_SYSTEM_NAME) set(VCPKG_CMAKE_SYSTEM_NAME Windows) |