From c592209c5f4d537b866548b1f2cb13e296b5dfc6 Mon Sep 17 00:00:00 2001 From: Phoebe <20694052+PhoebeHui@users.noreply.github.com> Date: Tue, 14 Sep 2021 11:10:12 +0800 Subject: [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 --- scripts/cmake/vcpkg_configure_cmake.cmake | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'scripts/cmake') 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) -- cgit v1.2.3