[vcpkg_cmake_configure/vcpkg_configure_cmake] Support VS2022 17.0 (#1…

…9088) * [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>
microsoft · Sep 14, 2021 · c592209 · c592209
1 parent ac0605b
commit c592209
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 2 deletions.
diff --git 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
@@ -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")

diff --git 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
@@ -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)

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -6729,7 +6729,7 @@
       "port-version": 1
     },
     "vcpkg-cmake": {
-      "baseline": "2021-07-30",
+      "baseline": "2021-09-13",
       "port-version": 0
     },
     "vcpkg-cmake-config": {

diff --git a/versions/v-/vcpkg-cmake.json b/versions/v-/vcpkg-cmake.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "fc4d9fcc5b8d2b97c083c6b70dd06df5174bd97b",
+      "version-date": "2021-09-13",
+      "port-version": 0
+    },
     {
       "git-tree": "c6df7e0faeda9e783175746c7c440c9bc2bdb111",
       "version-date": "2021-07-30",