From 420adf322a71aee5035cb6ae075e11afcee1fe3c Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Thu, 23 Sep 2021 10:16:33 +0200 Subject: [PATCH] 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 --- coin/platform_configs/cmake_platforms.yaml | 6 +++--- 1 file 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=']