diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-09-23 10:16:33 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-09-24 15:19:07 +0200 |
| commit | 420adf322a71aee5035cb6ae075e11afcee1fe3c (patch) | |
| tree | e16a796e2391bbe9a1780c3feda1f1abff40a21d /coin/platform_configs | |
| parent | f0b4d1c8f5d3433ff0004f198f38b764a4389b32 (diff) | |
CI: Turn dbus support off for QNX_710
The QNX toolchain file in the CI does not set
CMAKE_FIND_ROOT_PATH_MODE-like variables and CMake ends up finding the
host libdbus, causing the build of applications that use QtDBus (or any
module that depends on it) to break.
Fixes: QTBUG-96791
Task-number: QTQAINFRA-4502
Change-Id: I381747f15135fe65777985742dca0fd102583941
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'coin/platform_configs')
| -rw-r--r-- | coin/platform_configs/cmake_platforms.yaml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index 25295eec..58c0f19a 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -174,7 +174,7 @@ Configurations: Platform dependency: 'Ubuntu-20.04-host' Features: ['Sccache', 'DisableTests'] Environment variables: [ - 'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-x8664.cmake', + 'TARGET_CONFIGURE_ARGS=-DFEATURE_dbus=OFF -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-x8664.cmake', 'NON_QTBASE_TARGET_CONFIGURE_ARGS='] - Template: 'qtci-linux-Ubuntu-20.04-x86_64-50' @@ -185,7 +185,7 @@ Configurations: Platform dependency: 'Ubuntu-20.04-host' Features: ['Sccache', 'DisableTests'] Environment variables: [ - 'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-aarch64le.cmake', + 'TARGET_CONFIGURE_ARGS=-DFEATURE_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='] - Template: 'qtci-linux-Ubuntu-20.04-x86_64-50' @@ -196,5 +196,5 @@ Configurations: Platform dependency: 'Ubuntu-20.04-host' Features: ['Sccache', 'DisableTests'] Environment variables: [ - 'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-armv7le.cmake', + 'TARGET_CONFIGURE_ARGS=-DFEATURE_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='] |