diff options
| author | Michael Karcher <kitware@mkarcher.dialup.fu-berlin.de> | 2023-04-21 11:22:26 +0200 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2023-04-25 13:45:37 -0400 |
| commit | e78abf94e325502da7ed4c09e9176de5ad700d4a (patch) | |
| tree | b098bd4c5be2e996dd43f9fb4216afb1c5fe2591 /Modules | |
| parent | 3cf8206412377e954ce8300cae2b76c678e0cb2f (diff) | |
| download | cmake-e78abf94e325502da7ed4c09e9176de5ad700d4a.tar.gz | |
VS/Android: Use ApplicationTypeRevision 3.0 in VS2022
Visual Studio 17 (Marketing name: Visual Studio 2022) still ships with
"3.0" as most recent Variant of the Android application type.
Use this revision.
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/CMakeDetermineCompilerId.cmake | 2 | ||||
| -rw-r--r-- | Modules/Platform/Android-Determine.cmake | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Modules/CMakeDetermineCompilerId.cmake b/Modules/CMakeDetermineCompilerId.cmake index 67044fb3b2..c7240081f5 100644 --- a/Modules/CMakeDetermineCompilerId.cmake +++ b/Modules/CMakeDetermineCompilerId.cmake @@ -432,7 +432,7 @@ Id flags: ${testflags} ${CMAKE_${lang}_COMPILER_ID_FLAGS_ALWAYS} if(id_keyword STREQUAL "Android") if(CMAKE_GENERATOR MATCHES "Visual Studio 14") set(id_system_version "<ApplicationTypeRevision>2.0</ApplicationTypeRevision>") - elseif(CMAKE_GENERATOR MATCHES "Visual Studio 1[56]") + elseif(CMAKE_GENERATOR MATCHES "Visual Studio 1[567]") set(id_system_version "<ApplicationTypeRevision>3.0</ApplicationTypeRevision>") else() set(id_system_version "") diff --git a/Modules/Platform/Android-Determine.cmake b/Modules/Platform/Android-Determine.cmake index 715f68bb4e..bf717af679 100644 --- a/Modules/Platform/Android-Determine.cmake +++ b/Modules/Platform/Android-Determine.cmake @@ -45,7 +45,7 @@ if(CMAKE_GENERATOR MATCHES "Visual Studio") endif() if(CMAKE_GENERATOR MATCHES "Visual Studio 14") set(vcx_revision "2.0") - elseif(CMAKE_GENERATOR MATCHES "Visual Studio 1[56]") + elseif(CMAKE_GENERATOR MATCHES "Visual Studio 1[567]") set(vcx_revision "3.0") else() set(vcx_revision "") |