lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-01-06 15:06:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

coin: Use configure for QNX configurations

Browse Source 
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: Ibb84a88f7f1ebd1f98e9998fac4180b257e80461
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
(cherry picked from commit 7c9601115d)
This commit is contained in:
Alexandru Croitor
2022-04-19 15:48:08 +02:00
parent 47a7d9b16d
commit 6e7b4549a9
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
coin/platform_configs/cmake_platforms_qemu_qnx710.yaml
View File

@@ -8,14 +8,15 @@ Configurations:
Compiler: 'GCC'
Target compiler: 'QCC'
Platform dependency: 'Ubuntu-20.04-host'
Features: ['Packaging', 'InsignificantTests', 'VMSize8']
Features: ['Packaging', 'InsignificantTests', 'VMSize8', 'UseConfigure']
Environment variables: [
'TARGET_CONFIGURE_ARGS=-DFEATURE_developer_build=ON -DQT_FEATURE_dbus=OFF -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-x8664.cmake',
'TARGET_CONFIGURE_ARGS=-release -force-debug-info -developer-build -no-dbus -nomake examples',
'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-x8664.cmake',
'QT_CMAKE_DIR=/opt/cmake-3.21.1/bin',
"TESTARGS='{{.Env.QNX_QEMU_SSH}} LD_LIBRARY_PATH={{.Env.QNX_QEMU_LD_LIBRARY_PATH}} QSG_RHI_BACKEND=software QT_QPA_PLATFORM=offscreen QTEST_ENVIRONMENT=ci'",
"TESTRUNNER='python3 {{.SourceDir}}/coin_qnx_qemu_runner.py'",
"COIN_CTEST_RESULTSDIR=/home/qt/work",
'NON_QTBASE_TARGET_CONFIGURE_ARGS=']
"COIN_CTEST_RESULTSDIR=/home/qt/work"
]
-
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
Target os: 'QNX_710'
@@ -23,10 +24,11 @@ Configurations:
Compiler: 'GCC'
Target compiler: 'QCC'
Platform dependency: 'Ubuntu-20.04-host'
Features: ['Packaging', 'DisableTests']
Features: ['Packaging', 'DisableTests', 'UseConfigure']
Environment variables: [
'TARGET_CONFIGURE_ARGS=-DQT_FEATURE_dbus=OFF -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-aarch64le.cmake',
'NON_QTBASE_TARGET_CONFIGURE_ARGS=']
'TARGET_CONFIGURE_ARGS=-release -force-debug-info -no-dbus -nomake examples',
'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-aarch64le.cmake',
]
-
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
Target os: 'QNX_710'
@@ -34,7 +36,8 @@ Configurations:
Compiler: 'GCC'
Target compiler: 'QCC'
Platform dependency: 'Ubuntu-20.04-host'
Features: ['Packaging', 'DisableTests']
Features: ['Packaging', 'DisableTests', 'UseConfigure']
Environment variables: [
'TARGET_CONFIGURE_ARGS=-DQT_FEATURE_dbus=OFF -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-armv7le.cmake',
'NON_QTBASE_TARGET_CONFIGURE_ARGS=']
'TARGET_CONFIGURE_ARGS=-release -force-debug-info -no-dbus -nomake examples',
'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-armv7le.cmake',
]