Просмотр исходного кода

VS/Android: Use ApplicationTypeRevision 3.0 in VS2026

Extend commit e78abf94e3 (VS/Android: Use ApplicationTypeRevision 3.0 in
VS2022, 2023-04-21, v3.27.0-rc1~165^2~4) to cover VS 2026 too.  This was
missed in commit 3392b371e2 (VS: Add Visual Studio 18 2026 generator,
2025-08-20, v4.2.0-rc1~165^2~1).
Brad King 2 недель назад
Родитель
Сommit
863dc3a7ac

+ 1 - 1
Modules/CMakeDetermineCompilerId.cmake

@@ -604,7 +604,7 @@ Id flags: ${testflags} ${CMAKE_${lang}_COMPILER_ID_FLAGS_ALWAYS}
       set(id_api_level "<AndroidAPILevel>android-${CMAKE_SYSTEM_VERSION}</AndroidAPILevel>")
       if(CMAKE_GENERATOR MATCHES "Visual Studio 14")
         set(id_system_version "<ApplicationTypeRevision>2.0</ApplicationTypeRevision>")
-      elseif(CMAKE_GENERATOR MATCHES "Visual Studio 1[567]")
+      elseif(CMAKE_GENERATOR MATCHES "Visual Studio 1[5678]")
         set(id_system_version "<ApplicationTypeRevision>3.0</ApplicationTypeRevision>")
       else()
         set(id_system_version "")

+ 1 - 1
Modules/Platform/Android-Determine.cmake

@@ -53,7 +53,7 @@ if(CMAKE_GENERATOR MATCHES "Visual Studio")
     set(vcx_platform ${CMAKE_GENERATOR_PLATFORM})
     if(CMAKE_GENERATOR MATCHES "Visual Studio 14")
       set(vcx_revision "2.0")
-    elseif(CMAKE_GENERATOR MATCHES "Visual Studio 1[567]")
+    elseif(CMAKE_GENERATOR MATCHES "Visual Studio 1[5678]")
       set(vcx_revision "3.0")
     else()
       set(vcx_revision "")