diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2022-04-19 15:48:08 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2022-06-14 10:47:47 +0200 |
| commit | 6e7b4549a9a7c0e11bd3d32848d9f68861333761 (patch) | |
| tree | 3f937ba87bcea89408feccd877fa0811daa115e4 | |
| parent | 47a7d9b16df03932776c948c2cef361fd5d8a931 (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)
| -rw-r--r-- | coin/platform_configs/cmake_platforms_qemu_qnx710.yaml | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/coin/platform_configs/cmake_platforms_qemu_qnx710.yaml b/coin/platform_configs/cmake_platforms_qemu_qnx710.yaml index 3a04466d..def6abd9 100644 --- a/coin/platform_configs/cmake_platforms_qemu_qnx710.yaml +++ b/coin/platform_configs/cmake_platforms_qemu_qnx710.yaml @@ -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', + ] |