diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2022-04-19 15:48:08 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-06-09 17:15:26 +0000 |
| commit | b4333b6cd744c90863f1ebb49337c7cb517a80fa (patch) | |
| tree | d66ad3efbbf9d028d2a7e02e85a8482f48c6b5db | |
| parent | 91ebdeed2a1d0c7c2ef5736067a235c803b210a1 (diff) | |
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 7c9601115d37f17dc77ecabdc0dbf7883c8e667a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | coin/platform_configs/cmake_platforms_qemu_qnx710.yaml | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/coin/platform_configs/cmake_platforms_qemu_qnx710.yaml b/coin/platform_configs/cmake_platforms_qemu_qnx710.yaml index a0f5a36c..e97f4d46 100644 --- a/coin/platform_configs/cmake_platforms_qemu_qnx710.yaml +++ b/coin/platform_configs/cmake_platforms_qemu_qnx710.yaml @@ -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', + ] |