From e78abf94e325502da7ed4c09e9176de5ad700d4a Mon Sep 17 00:00:00 2001 From: Michael Karcher Date: Fri, 21 Apr 2023 11:22:26 +0200 Subject: 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. --- Modules/CMakeDetermineCompilerId.cmake | 2 +- Modules/Platform/Android-Determine.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Modules/CMakeDetermineCompilerId.cmake b/Modules/CMakeDetermineCompilerId.cmake index 67044fb..c724008 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 "2.0") - elseif(CMAKE_GENERATOR MATCHES "Visual Studio 1[56]") + elseif(CMAKE_GENERATOR MATCHES "Visual Studio 1[567]") set(id_system_version "3.0") else() set(id_system_version "") diff --git a/Modules/Platform/Android-Determine.cmake b/Modules/Platform/Android-Determine.cmake index 715f68b..bf717af 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 "") -- cgit v0.12