diff options
| author | Leander Beernaert <leander.beernaert@qt.io> | 2019-11-07 15:03:33 +0100 |
|---|---|---|
| committer | Leander Beernaert <leander.beernaert@qt.io> | 2019-11-08 09:40:24 +0000 |
| commit | 512aae3abea65dcdc1e3d667eab73b8f41cf5601 (patch) | |
| tree | 4fa04cc8aba5ea30a439ebb6c6a1a989a2f24593 /cmake | |
| parent | 6b193c88a7071b8ab9c81d2408b633a62226cf63 (diff) | |
Fix Android x86 builds
Replace condition x86 to i386 to match other platforms.
Regenerate src/gui/CMakeLists.txt
Disable SSE4 on android x86 to match qmake.
Change-Id: Ic0d330206f2d70a79d72553aa3ff0f91ff58119c
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/QtBaseConfigureTests.cmake | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/cmake/QtBaseConfigureTests.cmake b/cmake/QtBaseConfigureTests.cmake index 34e4e6e6f1..2b26926bcb 100644 --- a/cmake/QtBaseConfigureTests.cmake +++ b/cmake/QtBaseConfigureTests.cmake @@ -162,4 +162,13 @@ function(run_config_tests) run_linker_version_script_support() endfunction() +# The qmake build of android does not perform the right architecture tests and +# forcefully disables sse4 on android x86. We have to mimic this behavior +# for now +if (CMAKE_ANDROID_ARCH_ABI STREQUAL x86) + set(QT_FEATURE_sse4_1 OFF CACHE BOOL INTERNAL FORCE) + set(QT_FEATURE_sse4_2 OFF CACHE BOOL INTERNAL FORCE) + set(TEST_subarch_sse4_1 FALSE CACHE BOOL INTERNAL FORCE) + set(TEST_subarch_sse4_2 FALSE CACHE BOOL INTERNAL FORCE) +endif() run_config_tests() |