diff options
author | Tony Sarajärvi <tony.sarajarvi@qt.io> | 2020-11-05 09:40:13 +0000 |
---|---|---|
committer | Tony Sarajärvi <tony.sarajarvi@qt.io> | 2020-12-22 06:40:08 +0000 |
commit | 8aa15f4bbd8bd431790393efda15bcdf8b2f3c15 (patch) | |
tree | 868c4bb497bafbf0256e4407824b3cdd1ffa6b48 /coin/platform_configs/cmake_platforms.yaml | |
parent | ccac1dc652d2c0b6cb92490ad91390ddf502fbb2 (diff) |
Add a no-opengl build on Ubuntu 20.04
This reverts commit 9a8fb868ec2c526325408a4cbf3e628aa3377e30
partially.
See also d494d76c26df48c9cf3b45fc15ebad963fe34c52.
Task-number: QTQAINFRA-2577
Task-number: QTQAINFRA-3407
Change-Id: I6a01bea15002efe140c022a79e7f3f2f5a47c202
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Diffstat (limited to 'coin/platform_configs/cmake_platforms.yaml')
-rw-r--r-- | coin/platform_configs/cmake_platforms.yaml | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index d2f5a6d7..99e619a3 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -24,6 +24,14 @@ Configurations: - Template: 'qtci-linux-Ubuntu-20.04-x86_64-50' Compiler: 'GCC' + Features: ['Sccache', 'DisableTests'] + Configure arguments: '-DFEATURE_developer_build=ON -DINPUT_opengl=no -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache' + Environment variables: [ + 'NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache', + 'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'] +- + Template: 'qtci-linux-Ubuntu-20.04-x86_64-50' + Compiler: 'GCC' Features: ['Sccache', 'Documentation'] Configure arguments: '-DQT_BUILD_EXAMPLES=ON -DFEATURE_developer_build=ON -DWARNINGS_ARE_ERRORS=OFF -DQT_LIBINFIX=TestInfix -DQT_NAMESPACE=TestNamespace -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache' Environment variables: ['NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache', |