Browse Source

Merge topic 'vs2026-arm64' into release-4.2

376b93f48f Tests/RunCMake/GeneratorToolset: Fix Visual Studio 18 2026 host arch on ARM64

Acked-by: Kitware Robot <[email protected]>
Merge-request: !11432
Brad King 1 week ago
parent
commit
2fbdf51cdd
1 changed files with 1 additions and 1 deletions
  1. 1 1
      Tests/RunCMake/GeneratorToolset/TestToolsetHostArchNone.cmake

+ 1 - 1
Tests/RunCMake/GeneratorToolset/TestToolsetHostArchNone.cmake

@@ -6,7 +6,7 @@ if(CMAKE_GENERATOR MATCHES "Visual Studio 1[678]")
   cmake_host_system_information(RESULT is_64_bit QUERY IS_64BIT)
   if(is_64_bit)
     if("${CMAKE_HOST_SYSTEM_PROCESSOR}" STREQUAL "ARM64")
-      if(CMAKE_GENERATOR STREQUAL "Visual Studio 17 2022")
+      if(CMAKE_GENERATOR MATCHES "Visual Studio 1[78] ")
         if(NOT "${CMAKE_VS_PLATFORM_TOOLSET_HOST_ARCHITECTURE}" STREQUAL "ARM64")
           message(FATAL_ERROR "CMAKE_VS_PLATFORM_TOOLSET_HOST_ARCHITECTURE is not 'ARM64' as expected.")
         endif()