qiurui
/
qt5
mirror of https://github.com/qt/qt5.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Joerg Bornemann 2021-09-23 10:16:33 +02:00
parent f0b4d1c8f5
commit 420adf322a
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
coin/platform_configs/cmake_platforms.yaml
View File

@ -174,7 +174,7 @@ Configurations:
Platform dependency: 'Ubuntu-20.04-host' Platform dependency: 'Ubuntu-20.04-host'
Features: ['Sccache', 'DisableTests'] Features: ['Sccache', 'DisableTests']
Environment variables: [ 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='] 'NON_QTBASE_TARGET_CONFIGURE_ARGS=']
- -
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50' Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
@ -185,7 +185,7 @@ Configurations:
Platform dependency: 'Ubuntu-20.04-host' Platform dependency: 'Ubuntu-20.04-host'
Features: ['Sccache', 'DisableTests'] Features: ['Sccache', 'DisableTests']
Environment variables: [ 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='] 'NON_QTBASE_TARGET_CONFIGURE_ARGS=']
- -
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50' Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
@ -196,5 +196,5 @@ Configurations:
Platform dependency: 'Ubuntu-20.04-host' Platform dependency: 'Ubuntu-20.04-host'
Features: ['Sccache', 'DisableTests'] Features: ['Sccache', 'DisableTests']
Environment variables: [ 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='] 'NON_QTBASE_TARGET_CONFIGURE_ARGS=']