aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2022-04-19 15:55:11 +0200
committerAlexandru Croitor <alexandru.croitor@qt.io>2022-06-14 10:47:49 +0200
commit34fb91a29b7010bb22e9fcb45a806dd2beada15d (patch)
tree72734dadaefe7b9c2a225a198cd3457b2bff0a7d
parent6e7b4549a9a7c0e11bd3d32848d9f68861333761 (diff)
coin: Use configure for Integrity configurations
Use the configure script to configure Qt in the CI, instead of calling CMake directly. Task-number: QTQAINFRA-4357 Task-number: QTQAINFRA-4815 Change-Id: I128f5e424481ba8fbb4649c75be818abee57e03e Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> (cherry picked from commit 6ec880ea47fd6b8ce074af44feb4ca2a973b4afb) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--coin/platform_configs/integrity.yaml8
1 files changed, 5 insertions, 3 deletions
diff --git a/coin/platform_configs/integrity.yaml b/coin/platform_configs/integrity.yaml
index 8049ab89..223ffaf3 100644
--- a/coin/platform_configs/integrity.yaml
+++ b/coin/platform_configs/integrity.yaml
@@ -6,13 +6,15 @@ Configurations:
Compiler: 'GCC'
Target os: 'INTEGRITY'
Platform dependency: 'Ubuntu-20.04-host'
- Features: ['MinimalStaticTests', 'DoNotRunTests', 'VMSize16']
+ Features: ['MinimalStaticTests', 'DoNotRunTests', 'VMSize16', 'UseConfigure']
Environment variables: [
- 'TARGET_CONFIGURE_ARGS={{.Env.TARGET_CONFIGURE_ARGS}} -DQT_HOST_PATH=/home/qt/work/install -DQT_BUILD_EXAMPLES=OFF -DCMAKE_TOOLCHAIN_FILE=/home/qt/integrity_toolchain/toolchain.cmake -DQT_QMAKE_TARGET_MKSPEC=devices/integrity-armv8-SA8155P -DFEATURE_library=OFF -DBUILD_qtdoc=OFF -DBUILD_qttranslations=OFF -DFEATURE_printdialog=OFF --debug-trycompile -DFEATURE_dbus=OFF -GNinja -DUNIX=ON -DFEATURE_gtk3=OFF -DFEATURE_glib=OFF -DFEATURE_libudev=OFF -DFEATURE_system_harfbuzz=OFF -DFEATURE_system_pcre2=OFF -DFEATURE_sql_mysql=OFF -DCMAKE_C_COMPILER=cxintarm64 -DCMAKE_CXX_COMPILER=cxintarm64',
+ 'TARGET_CONFIGURE_ARGS=-nomake examples -device integrity-armv8-SA8155P -no-feature-library -no-feature-printdialog -no-dbus -no-feature-gtk3 -no-feature-glib -no-feature-libudev -qt-harfbuzz -qt-pcre -no-sql-mysql',
+ 'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE=/home/qt/integrity_toolchain/toolchain.cmake -DCMAKE_C_COMPILER=cxintarm64 -DCMAKE_CXX_COMPILER=cxintarm64 -DBUILD_qtdoc=OFF -DBUILD_qttranslations=OFF -DUNIX=ON --debug-trycompile',
+ 'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_system_webp=OFF',
'INTEGRITY_DIR=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/integrity',
'INTEGRITY_BSP=platform-sa8155', 'INTEGRITY_BUILD_TARGET=rel',
'QC_MULTIMEDIA_INC_DIR=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/include/amss/multimedia',
'GL_INC_DIR=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/AMSS/multimedia/graphics/include/public',
'GL_LIB_DIR=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/out/rel/libs/base:/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/out/rel/libs/multimedia/display:/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/out/rel/libs/multimedia/graphics:/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/out/rel/libs/platform/:/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/AMSS/multimedia/graphics/opengl/esx/build/integrity/prebuilt/',
'PATH=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/comp:$PATH',
- 'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DFEATURE_system_webp=OFF']
+ ]