diff options
| author | Aleix Pol <aleixpol@kde.org> | 2019-07-26 21:46:40 +0200 |
|---|---|---|
| committer | Aleix Pol <aleixpol@kde.org> | 2019-07-29 02:50:36 +0200 |
| commit | 101474c7a59492a6c0d953ca58020e6ff1bfa515 (patch) | |
| tree | a03ddf0075fb175e1d94f9e67648cbcde14945c5 | |
| parent | 685959c3fa78a2c21c4ebb999de1831b9664e186 (diff) | |
| download | extra-cmake-modules-5.61.0-rc1.tar.gz extra-cmake-modules-5.61.0-rc1.tar.bz2 | |
android: Allow overriding ANDROID_ARCH and ANDROID_ARCH_ABI as envvarsv5.61.0-rc1v5.61.0
| -rw-r--r-- | toolchain/Android.cmake | 10 | ||||
| -rw-r--r-- | toolchain/deployment-file.json.in | 2 |
2 files changed, 9 insertions, 3 deletions
diff --git a/toolchain/Android.cmake b/toolchain/Android.cmake index ac6f7658..5c27db29 100644 --- a/toolchain/Android.cmake +++ b/toolchain/Android.cmake @@ -144,10 +144,16 @@ macro(set_deprecated_variable actual_variable deprecated_variable default_value) endmacro() set_deprecated_variable(CMAKE_ANDROID_NDK ANDROID_NDK "$ENV{ANDROID_NDK}") -set_deprecated_variable(CMAKE_ANDROID_ARCH ANDROID_ARCHITECTURE "arm") set_deprecated_variable(CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION ANDROID_GCC_VERSION "clang") -set_deprecated_variable(CMAKE_ANDROID_ARCH_ABI ANDROID_ABI "armeabi-v7a") set_deprecated_variable(CMAKE_ANDROID_API ANDROID_API_LEVEL "21") +if(NOT DEFINED ENV{ANDROID_ARCH}) + set(ENV{ANDROID_ARCH} "arm") +endif() +set_deprecated_variable(CMAKE_ANDROID_ARCH ANDROID_ARCHITECTURE $ENV{ANDROID_ARCH}) +if(NOT DEFINED ENV{ANDROID_ARCH_ABI}) + set(ENV{ANDROID_ARCH_ABI} "armeabi-v7a") +endif() +set_deprecated_variable(CMAKE_ANDROID_ARCH_ABI ANDROID_ABI "$ENV{ANDROID_ARCH_ABI}") set(ANDROID_SDK_ROOT "$ENV{ANDROID_SDK_ROOT}" CACHE PATH "Android SDK path") diff --git a/toolchain/deployment-file.json.in b/toolchain/deployment-file.json.in index 907401b9..8ca5be8b 100644 --- a/toolchain/deployment-file.json.in +++ b/toolchain/deployment-file.json.in @@ -6,7 +6,7 @@ "tool-prefix": "##ANDROID_COMPILER_PREFIX##", "toolchain-version": "##ANDROID_TOOLCHAIN_VERSION##", "ndk-host": "@_LOWER_CMAKE_HOST_SYSTEM_NAME@-@CMAKE_HOST_SYSTEM_PROCESSOR@", - "target-architecture": "@ANDROID_ABI@", + "target-architecture": "@CMAKE_ANDROID_ARCH_ABI@", "application-binary": "@EXECUTABLE_DESTINATION_PATH@", "qml-root-path": "@CMAKE_SOURCE_DIR@", @DEFINE_QML_IMPORT_PATHS@ |