diff options
| author | Leander Beernaert <leander.beernaert@qt.io> | 2019-10-14 15:18:50 +0200 |
|---|---|---|
| committer | Leander Beernaert <leander.beernaert@qt.io> | 2019-10-14 13:49:40 +0000 |
| commit | 6694689a26c97d76f2fb7a518f0788b1e0eaf4e6 (patch) | |
| tree | a14d364a81b7ac44312692a3855f96eff49a6f6c /cmake/QtBuild.cmake | |
| parent | 665f75f1f112f948f8acfadc1d54b0df8c4211a4 (diff) | |
Fix Android build from multi-arch qmake changes
Add condition replacements for the android ABIs.
Add a replacement for QT_ARCH to ANDROID_ABI, since QT_ARCH is only used
with the android build for now.
Change-Id: I553d7910546de32236f723ec2e9a05a18da76130
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'cmake/QtBuild.cmake')
| -rw-r--r-- | cmake/QtBuild.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake index e36e7b379d..49ebc82b1b 100644 --- a/cmake/QtBuild.cmake +++ b/cmake/QtBuild.cmake @@ -1317,7 +1317,7 @@ function(add_qt_module target) add_library("${target}" STATIC) endif() - if (android) + if (ANDROID) qt_android_apply_arch_suffix("${target}") endif() qt_internal_add_target_aliases("${target}") @@ -2548,7 +2548,7 @@ function(add_cmake_library target) set(arg_ARCHIVE_INSTALL_DIRECTORY "${arg_INSTALL_DIRECTORY}") endif() - if (android) + if (ANDROID) qt_android_apply_arch_suffix("${target}") endif() |