From 322f6b1f04440cc2b2cd21a5209fbf8e82c65930 Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Wed, 2 Feb 2022 18:58:53 +0200 Subject: Update tqtc-android-automotive targets and add test target The module is android specific and thus tests need to be disabled for platforms other than Android Automotive. Change-Id: If7528bc0845c6266d77f94e8e6c7d0ba67075d1a Reviewed-by: Heikki Halmet (cherry picked from commit 69536e4b45633892a788265af393cbd36385c35d) Reviewed-by: Qt Cherry-pick Bot --- coin/platform_configs/tqtc-android-automotive.yaml | 49 +++++++++++++++++++++- 1 file changed, 47 insertions(+), 2 deletions(-) (limited to 'coin') diff --git a/coin/platform_configs/tqtc-android-automotive.yaml b/coin/platform_configs/tqtc-android-automotive.yaml index c3233842..f2226a6c 100644 --- a/coin/platform_configs/tqtc-android-automotive.yaml +++ b/coin/platform_configs/tqtc-android-automotive.yaml @@ -1,3 +1,48 @@ Version: 2 -Include: [cmake_platforms.yaml] -Configurations: [] +Include: [ + cmake_platforms_target_android_host_linux.yaml, + cmake_platforms_target_android_host_macos.yaml, + cmake_platforms_target_android_host_windows.yaml + ] +Configurations: +- + Id: 'Windows10_21H2-Mingw11-x64-host' + Template: 'qtci-windows-10_21H2-x86_64-51' + Compiler: 'Mingw' + Features: ['Packaging', 'Sccache', 'DoNotRunTests'] + Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DQT_BUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DFEATURE_system_tiff=OFF -DFEATURE_system_freetype=OFF -DFEATURE_system_jpeg=OFF -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..' + Environment variables: [ + 'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}', + 'NON_QTBASE_CONFIGURE_ARGS=-DFEATURE_system_tiff=OFF', + 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}'] +- + Id: 'macos-latest-xcode-universal-packaging-build' + Template: 'qtci-macos-12-x86_64-102' + Compiler: 'Clang' + Target arch: 'x86_64-arm64' + Features: ['Packaging', 'Sccache', 'DoNotRunTests', 'WarningsAreErrors'] + Configure arguments: '-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DFEATURE_headersclean=ON -DFEATURE_framework=ON -DODBC_ROOT=/usr/local/opt/libiodbc -DPostgreSQL_ROOT={{.Env.POSTGRESQLBINPATH}}/.. -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}' + Environment variables: [ + 'NON_QTBASE_CONFIGURE_ARGS=-DFEATURE_gds=OFF', + 'CONAN_PROFILE=coin/conan/profiles/macos-universal-clang'] +- + Id: 'RHEL-8.4-host' + Template: 'qtci-linux-RHEL-8.4-x86_64-50' + Compiler: 'GCC' + Features: ['Packaging', 'Sccache', 'DoNotRunTests'] + Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_headersclean=ON -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 -DINPUT_bundled_xcb_xinput=yes -DOpenGL_GL_PREFERENCE=LEGACY' + Environment variables: [ + 'CONAN_PROFILE=coin/conan/profiles/linux-x86_64-gcc'] +- + Template: 'qtci-linux-RHEL-8.4-x86_64-50' + Target os: 'Android_ANY' + Target arch: 'x86' + Compiler: 'GCC' + Target compiler: 'Clang' + Platform dependency: 'RHEL-8.4-host' + Features: ['Packaging', 'Sccache', 'AndroidTestRun'] + Environment variables: [ + 'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_ROOT}} -DANDROID_ABI=x86 -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}', + 'CONAN_HOST_PROFILE=coin/conan/profiles/linux-x86_64-gcc', + 'CONAN_PROFILE=coin/conan/profiles/unix-android-x86-clang', + 'ANDROID_EMULATOR=@x86AutomotiveEmulator'] -- cgit v1.2.3