Merge topic 'vs2026-android' into release-4.2

863dc3a7ac VS/Android: Use ApplicationTypeRevision 3.0 in VS2026

Acked-by: Kitware Robot <[email protected]>
Merge-request: !11431

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 "")

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 "")