diff options
author | Haibo Huang <hhb@google.com> | 2020-10-08 16:54:36 -0700 |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2020-10-09 09:49:19 -0400 |
commit | 5c2f9e3eeb89c50fa110daa1f33945381b1416ed (patch) | |
tree | f0e5595843baf441cdab79337f90bf5b713e4aab /Modules/Platform/Android-Determine.cmake | |
parent | 488141fe373f9c4e1dfd3d63e9c932c37d577547 (diff) | |
download | cmake-5c2f9e3eeb89c50fa110daa1f33945381b1416ed.tar.gz |
Android: Fatal if ABI is not supported by NDK
Diffstat (limited to 'Modules/Platform/Android-Determine.cmake')
-rw-r--r-- | Modules/Platform/Android-Determine.cmake | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Modules/Platform/Android-Determine.cmake b/Modules/Platform/Android-Determine.cmake index 314d80bce0..58905dfabe 100644 --- a/Modules/Platform/Android-Determine.cmake +++ b/Modules/Platform/Android-Determine.cmake @@ -353,6 +353,12 @@ if(NOT CMAKE_ANDROID_ARCH_ABI) endif() endif() endif() +if(_INCLUDED_ABIS AND NOT CMAKE_ANDROID_ARCH_ABI IN_LIST NDK_DEFAULT_ABIS) + message(FATAL_ERROR + "Android: ABI '${CMAKE_ANDROID_ARCH_ABI}' is not supported by the NDK.\n" + "Supported ABIS: ${NDK_DEFAULT_ABIS}." + ) +endif() set(CMAKE_ANDROID_ARCH "${_ANDROID_ABI_${CMAKE_ANDROID_ARCH_ABI}_ARCH}") if(_ANDROID_SYSROOT_ARCH AND NOT "x${_ANDROID_SYSROOT_ARCH}" STREQUAL "x${CMAKE_ANDROID_ARCH}") message(FATAL_ERROR |