diff --git a/ports/vcpkg-cmake/vcpkg.json b/ports/vcpkg-cmake/vcpkg.json index 96134a85035daa..49b1387178e8c5 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 801db016640505..c9657bfa9a0941 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") diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake index b385476395b5be..9769b611328b20 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 0377ae5dd8c56b..1e0a1100d5fb7f 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) diff --git a/versions/baseline.json b/versions/baseline.json index f6c7eda8a48a0b..6558eecb54255a 100644 --- 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 index 086edd0208cb20..6c05751fd73036 100644 --- 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",