diff options
| author | Michael Karcher <kitware@mkarcher.dialup.fu-berlin.de> | 2023-04-21 14:58:02 (GMT) |
|---|---|---|
| committer | Michael Karcher <kitware@mkarcher.dialup.fu-berlin.de> | 2023-04-26 16:11:23 (GMT) |
| commit | ca6e81a31fbb170d04872490a28b93d509dd5435 (patch) | |
| tree | de8ca61c5eca9e8648e13f56841080aa5f866c3c /Modules | |
| parent | 663cc941bd176347fb2fa89191629c6843bb4ebd (diff) | |
| download | CMake-ca6e81a31fbb170d04872490a28b93d509dd5435.zip CMake-ca6e81a31fbb170d04872490a28b93d509dd5435.tar.gz CMake-ca6e81a31fbb170d04872490a28b93d509dd5435.tar.bz2 | |
VS/Android: Deduce processor type from CMAKE_GENERATOR_PLATFORM
Closes: #24839
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/Platform/Android-Determine.cmake | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/Modules/Platform/Android-Determine.cmake b/Modules/Platform/Android-Determine.cmake index bc60222..307e4c9 100644 --- a/Modules/Platform/Android-Determine.cmake +++ b/Modules/Platform/Android-Determine.cmake @@ -34,8 +34,21 @@ cmake_policy(PUSH) cmake_policy(SET CMP0057 NEW) # if IN_LIST # If using Android tools for Visual Studio, compile a sample project to get the -# NDK path +# NDK path and set the processor from the generator platform. if(CMAKE_GENERATOR MATCHES "Visual Studio") + if(NOT CMAKE_ANDROID_ARCH_ABI AND NOT CMAKE_SYSTEM_PROCESSOR) + if(CMAKE_GENERATOR_PLATFORM STREQUAL "ARM") + set(CMAKE_SYSTEM_PROCESSOR "armv7-a") + elseif(CMAKE_GENERATOR_PLATFORM STREQUAL "ARM64") + set(CMAKE_SYSTEM_PROCESSOR "aarch64") + elseif(CMAKE_GENERATOR_PLATFORM STREQUAL "x86") + set(CMAKE_SYSTEM_PROCESSOR "i686") + elseif(CMAKE_GENERATOR_PLATFORM STREQUAL "x64") + set(CMAKE_SYSTEM_PROCESSOR "x86_64") + else() + message(FATAL_ERROR "Unhandled generator platform, please choose ARM, ARM64, x86 or x86_64 using -A") + endif() + endif() if(NOT CMAKE_ANDROID_NDK) set(vcx_platform ${CMAKE_GENERATOR_PLATFORM}) if(CMAKE_GENERATOR MATCHES "Visual Studio 14") |