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 /ports | |
| 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 'ports')
| -rw-r--r-- | ports/vcpkg-cmake/vcpkg.json | 2 | ||||
| -rw-r--r-- | ports/vcpkg-cmake/vcpkg_cmake_configure.cmake | 13 |
2 files changed, 14 insertions, 1 deletions
diff --git a/ports/vcpkg-cmake/vcpkg.json b/ports/vcpkg-cmake/vcpkg.json index 96134a850..49b138717 100644 --- a/ports/vcpkg-cmake/vcpkg.json +++ b/ports/vcpkg-cmake/vcpkg.json @@ -1,4 +1,4 @@ { "name": "vcpkg-cmake", - "version-date": "2021-07-30" + "version-date": "2021-09-13" } diff --git a/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake b/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake index 801db0166..c9657bfa9 100644 --- a/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake +++ b/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake @@ -207,6 +207,19 @@ function(vcpkg_cmake_configure) else() set(generator) endif() + elseif(VCPKG_PLATFORM_TOOLSET STREQUAL "v143") + set(generator "Visual Studio 17 2022") + if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + set(arch "Win32") + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + set(arch "x64") + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") + set(arch "ARM") + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + set(arch "ARM64") + else() + set(generator) + endif() endif() else() set(generator "Ninja") |