diff options
| author | Tobrun <tobrun.van.nuland@gmail.com> | 2018-03-15 13:07:46 +0100 |
|---|---|---|
| committer | tobrun <tobrun.van.nuland@gmail.com> | 2018-05-17 18:33:30 +0200 |
| commit | 536a49dd8e13274db9f25201c84f53f81cf22fc7 (patch) | |
| tree | 87ce6ce7eaf098fa9cc35b7dd8ba4da0ecf1c00a /cmake | |
| parent | 7d1e52a3255d4eecdcd37e4fb600eb76fa9333f8 (diff) | |
| download | qtlocation-mapboxgl-536a49dd8e13274db9f25201c84f53f81cf22fc7.tar.gz | |
[android] - remove mips and armeabi as supported ABIsupstream/tvn-ndk-17
[android] - bump CI image to NDK 17 compatible
[core] - remove setting edgeDistance to 0, comparison 'const short' > 32767 is always false
[android] - remove throwing in desructor, undefined behaviour
[android] - bump dependency versions of project
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/mason.cmake | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/cmake/mason.cmake b/cmake/mason.cmake index bc31feeb5f..6116067080 100644 --- a/cmake/mason.cmake +++ b/cmake/mason.cmake @@ -23,9 +23,7 @@ function(mason_detect_platform) if(NOT MASON_PLATFORM_VERSION) # Android Studio only passes ANDROID_ABI, but we need to adjust that to the Mason if(MASON_PLATFORM STREQUAL "android" AND NOT MASON_PLATFORM_VERSION) - if (ANDROID_ABI STREQUAL "armeabi") - set(MASON_PLATFORM_VERSION "arm-v5-9" PARENT_SCOPE) - elseif (ANDROID_ABI STREQUAL "armeabi-v7a") + if (ANDROID_ABI STREQUAL "armeabi-v7a") set(MASON_PLATFORM_VERSION "arm-v7-9" PARENT_SCOPE) elseif (ANDROID_ABI STREQUAL "arm64-v8a") set(MASON_PLATFORM_VERSION "arm-v8-21" PARENT_SCOPE) @@ -33,10 +31,6 @@ function(mason_detect_platform) set(MASON_PLATFORM_VERSION "x86-9" PARENT_SCOPE) elseif (ANDROID_ABI STREQUAL "x86_64") set(MASON_PLATFORM_VERSION "x86-64-21" PARENT_SCOPE) - elseif (ANDROID_ABI STREQUAL "mips") - set(MASON_PLATFORM_VERSION "mips-9" PARENT_SCOPE) - elseif (ANDROID_ABI STREQUAL "mips64") - set(MASON_PLATFORM_VERSION "mips-64-9" PARENT_SCOPE) else() message(FATAL_ERROR "Unknown ANDROID_ABI '${ANDROID_ABI}'.") endif() |