mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-29 02:19:18 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'vs2026-android'

Browse Source 
863dc3a7ac VS/Android: Use ApplicationTypeRevision 3.0 in VS2026

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11431
This commit is contained in:
Brad King
2025-11-21 13:22:53 +00:00
committed by Kitware Robot
parent df31d7f613 863dc3a7ac
commit aec11718d9
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Modules/CMakeDetermineCompilerId.cmake
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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 "")