mirror of
git://code.qt.io/qt/qt5.git
synced 2025-12-21 15:38:15 +08:00
coin: Use configure for QNX 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: Ibb84a88f7f1ebd1f98e9998fac4180b257e80461
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
(cherry picked from commit 7c9601115d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
committed by
Qt Cherry-pick Bot
parent
91ebdeed2a
commit
b4333b6cd7
@@ -7,12 +7,13 @@ Configurations:
|
||||
Compiler: 'GCC'
|
||||
Target compiler: 'QCC'
|
||||
Platform dependency: 'Ubuntu-20.04-host'
|
||||
Features: ['Packaging', 'VMSize8']
|
||||
Features: ['Packaging', '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.3/bin',
|
||||
'QNX_TEST_ENV=LD_LIBRARY_PATH={{.Env.QNX_QEMU_LD_LIBRARY_PATH}} QSG_RHI_BACKEND=software QT_QPA_PLATFORM=offscreen QTEST_ENVIRONMENT=ci',
|
||||
'NON_QTBASE_TARGET_CONFIGURE_ARGS=']
|
||||
]
|
||||
-
|
||||
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
|
||||
Target os: 'QNX_710'
|
||||
@@ -20,10 +21,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'
|
||||
@@ -31,7 +33,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',
|
||||
]
|
||||
|
||||
Reference in New Issue
Block a user