diff options
| author | Gabriel Souza Franco <gabrielfrancosouza@gmail.com> | 2020-09-12 21:12:00 -0300 |
|---|---|---|
| committer | Aleix Pol Gonzalez <aleixpol@kde.org> | 2020-09-16 14:53:29 +0000 |
| commit | 7b05256f9e8a5d87a4aa2a3a9b84ec9ce8a65fe5 (patch) | |
| tree | 2a7b88360969d366b164e944a0f5b24d9ef49485 /toolchain/Android.cmake | |
| parent | 3672943cf1128470cae08c70f2d5c97887cd3125 (diff) | |
| download | extra-cmake-modules-7b05256f9e8a5d87a4aa2a3a9b84ec9ce8a65fe5.tar.gz extra-cmake-modules-7b05256f9e8a5d87a4aa2a3a9b84ec9ce8a65fe5.tar.bz2 | |
Explicitly sort Android version lists
Also document --android-platform parameter
Diffstat (limited to 'toolchain/Android.cmake')
| -rw-r--r-- | toolchain/Android.cmake | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/toolchain/Android.cmake b/toolchain/Android.cmake index e3ace15a..de40c986 100644 --- a/toolchain/Android.cmake +++ b/toolchain/Android.cmake @@ -142,6 +142,7 @@ set_deprecated_variable(CMAKE_ANDROID_ARCH_ABI ANDROID_ABI "$ENV{ANDROID_ARCH_AB set(ANDROID_SDK_ROOT "$ENV{ANDROID_SDK_ROOT}" CACHE PATH "Android SDK path") file(GLOB platforms LIST_DIRECTORIES TRUE RELATIVE ${ANDROID_SDK_ROOT}/platforms ${ANDROID_SDK_ROOT}/platforms/*) +list(SORT platforms COMPARE NATURAL) list(GET platforms -1 _default_platform) set(ANDROID_SDK_COMPILE_API "${_default_platform}" CACHE STRING "Android API Level") if(ANDROID_SDK_COMPILE_API MATCHES "^android-([0-9]+)$") @@ -149,6 +150,7 @@ if(ANDROID_SDK_COMPILE_API MATCHES "^android-([0-9]+)$") endif() file(GLOB build-tools LIST_DIRECTORIES TRUE RELATIVE ${ANDROID_SDK_ROOT}/build-tools ${ANDROID_SDK_ROOT}/build-tools/*) +list(SORT build-tools COMPARE NATURAL) list(GET build-tools -1 _default_sdk) set(ANDROID_SDK_BUILD_TOOLS_REVISION "${_default_sdk}" CACHE STRING "Android Build Tools version") |