From a71c7421e2cc9b643250b222c01d37b164b61efa Mon Sep 17 00:00:00 2001 From: "Joshua T. Fisher" Date: Tue, 27 Sep 2022 15:49:44 -0700 Subject: [PATCH] Add elseifs to attempt to see if cmake has selected to target arm64. (#26878) --- scripts/buildsystems/vcpkg.cmake | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake index 73588faa90..db422b0349 100644 --- a/scripts/buildsystems/vcpkg.cmake +++ b/scripts/buildsystems/vcpkg.cmake @@ -260,8 +260,12 @@ else() set(Z_VCPKG_TARGET_TRIPLET_ARCH arm) elseif(CMAKE_GENERATOR STREQUAL "Visual Studio 15 2017") set(Z_VCPKG_TARGET_TRIPLET_ARCH x86) + elseif(CMAKE_GENERATOR STREQUAL "Visual Studio 16 2019" AND CMAKE_VS_PLATFORM_NAME_DEFAULT STREQUAL "ARM64") + set(Z_VCPKG_TARGET_TRIPLET_ARCH arm64) elseif(CMAKE_GENERATOR STREQUAL "Visual Studio 16 2019") set(Z_VCPKG_TARGET_TRIPLET_ARCH x64) + elseif(CMAKE_GENERATOR STREQUAL "Visual Studio 17 2022" AND CMAKE_VS_PLATFORM_NAME_DEFAULT STREQUAL "ARM64") + set(Z_VCPKG_TARGET_TRIPLET_ARCH arm64) elseif(CMAKE_GENERATOR STREQUAL "Visual Studio 17 2022") set(Z_VCPKG_TARGET_TRIPLET_ARCH x64) else()