diff options
| author | Alexey Edelev <semlanik@gmail.com> | 2021-10-13 14:03:53 +0200 |
|---|---|---|
| committer | Alexey Edelev <semlanik@gmail.com> | 2021-10-14 19:57:10 +0200 |
| commit | 61441074ef8ad63f6dc46253a6b0ea9d26506ef8 (patch) | |
| tree | 8552be78d9fcd2c8dd98ee8666e491f6f5b4be1f /cmake/QtBuildInternals | |
| parent | 5e55297ee01b20c9cd4119a6e5757a0b4aafd620 (diff) | |
| download | qtbase-61441074ef8ad63f6dc46253a6b0ea9d26506ef8.tar.gz | |
Set QT_ANDROID_ABIS when builing qtbase for Android
When building Qt we need to set QT_ANDROID_ABIS value to
CMAKE_ANDROID_ARCH_ABI explictily since the automatical detecting of
android ABI is not executed. This fixes build of the qtbase in-tree
tests.
Fixes: QTBUG-97133
Change-Id: Ica7057bcfcc8f4fe4b5a921ca7449f74cdbca0f1
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Diffstat (limited to 'cmake/QtBuildInternals')
| -rw-r--r-- | cmake/QtBuildInternals/QtBuildInternalsConfig.cmake | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake index bd1aeafc8f..b8c4188237 100644 --- a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake +++ b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake @@ -627,6 +627,12 @@ macro(qt_build_tests) # prefix. For super builds it needs to be done in qt5/CMakeLists.txt. qt_set_up_fake_standalone_tests_install_prefix() endif() + else() + if(ANDROID) + # When building in-tree tests we need to specify the QT_ANDROID_ABIS list. Since we + # build Qt for the single ABI, build tests for this ABI only. + set(QT_ANDROID_ABIS "${CMAKE_ANDROID_ARCH_ABI}") + endif() endif() if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/auto/CMakeLists.txt") |