From 465e18ee1074ac28d4bf4dfeac6404d9d387dd0f Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Wed, 19 Aug 2020 11:11:40 +0200 Subject: CMake: Add some missing Linux host Android target architectures In Qt 5 times, qmake was able to build libraries for multiple Android ABIs in one build tree. In Qt 6.0 + CMake we can't do that yet, which is tracked in QTBUG-80943. We still need to build and ship libraries for all the ABIs, so use the old style approach of one configuration per ABI. Add some of the missing ABIs for the Linux host case: arm64-v8a, armeabi-v7a, x86. The x86_64 ABI will be added in a separate change, due to a bug in qtbase regarding Gui's qdrawhelper.cpp and avx2. Because it's a lot of copy pasting, move the configs into a separate yaml file so it's easier to search and replace in the future. Task-number: QTBUG-86053 Change-Id: If8419ce20ac033b644c49c0bac70196cd30fd679 Reviewed-by: Qt CI Bot Reviewed-by: Toni Saario --- coin/platform_configs/cmake_platforms.yaml | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'coin/platform_configs/cmake_platforms.yaml') diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index 0351663c..c3fe6353 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -1,4 +1,5 @@ Version: 2 +Include: [cmake_platforms_target_android_host_linux.yaml] Configurations: - Template: 'qtci-linux-Ubuntu-20.04-x86_64-50' @@ -38,15 +39,6 @@ Configurations: Features: ['Packaging', 'Sccache'] Configure arguments: '-DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}} -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DFEATURE_system_jpeg=OFF -DFEATURE_system_png=OFF -DFEATURE_system_pcre2=OFF -DFEATURE_system_harfbuzz=OFF -DFEATURE_system_doubleconversion=OFF -DFEATURE_libudev=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache' Environment variables: ['NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'] -- - Template: 'qtci-linux-RHEL-7.6-x86_64' - Target os: 'Android_ANY' - Target arch: 'arm64' - Compiler: 'GCC' - Target compiler: 'Clang' - Platform dependency: 'RHEL-7.6-host' - Features: ['Packaging', 'Sccache'] - Environment variables: ['TARGET_CONFIGURE_ARGS=-DBUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_HOME}} -DANDROID_ABI=arm64-v8a -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}', 'NON_QTBASE_TARGET_CONFIGURE_ARGS='] - Template: 'qtci-macos-10.14-x86_64' Target os: 'IOS_ANY' -- cgit v1.2.3