diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2022-02-15 15:12:58 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2022-06-08 23:27:19 +0200 |
| commit | 99731bc155075052a0f11fa5a9e99fc87720bd86 (patch) | |
| tree | 5532b7eec372bc1b44ea6f089e1919148da7ae05 /coin/platform_configs/cmake_platforms.yaml | |
| parent | fe9efd359498dc342257908f6c9c2183e95fc05d (diff) | |
coin: Use configure for Ubuntu desktop configurations
Use the configure script to configure Qt in the CI, instead of calling
CMake directly.
Pick-to: 6.2 6.3 6.4
Task-number: QTQAINFRA-4357
Task-number: QTQAINFRA-4815
Change-Id: I2620014c3858c1f343f8698fc3f8de4f9188ad4b
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
Diffstat (limited to 'coin/platform_configs/cmake_platforms.yaml')
| -rw-r--r-- | coin/platform_configs/cmake_platforms.yaml | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index b6c4337e..0c1e5a4b 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -12,14 +12,17 @@ Configurations: - Template: 'qtci-linux-Ubuntu-20.04-x86_64-50' Compiler: 'GCC' - Features: ['Sccache', 'Documentation', 'TestDocs'] - Configure arguments: '-DQT_BUILD_EXAMPLES=ON -DFEATURE_developer_build=ON -DFEATURE_cxx20=ON -DWARNINGS_ARE_ERRORS=OFF -DQT_LIBINFIX=TestInfix -DQT_NAMESPACE=TestNamespace' + Features: ['Sccache', 'Documentation', 'TestDocs', 'UseConfigure'] + Configure arguments: '-make examples -developer-build -c++std c++20 -no-warnings-are-errors -qtlibinfix TestInfix -qtnamespace TestNamespace' - Id: 'Ubuntu-20.04-host' Template: 'qtci-linux-Ubuntu-20.04-x86_64-50' Compiler: 'GCC' - Features: ['Sccache'] - Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_headersclean=ON -DFEATURE_separate_debug_info=ON -DFEATURE_system_jpeg=OFF -DFEATURE_system_png=OFF -DFEATURE_system_pcre2=OFF -DFEATURE_system_harfbuzz=OFF -DFEATURE_system_doubleconversion=OFF -DFEATURE_libudev=OFF -DCMAKE_AUTOGEN_VERBOSE=ON -DINPUT_bundled_xcb_xinput=yes -DOpenGL_GL_PREFERENCE=LEGACY' + Features: ['Sccache', 'UseConfigure'] + Configure arguments: '-nomake examples -release -force-debug-info -separate-debug-info -headersclean -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput' + Environment variables: [ + 'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY' + ] - Id: 'OpenSUSE-15.3-host' Template: 'qtci-linux-openSUSE-15.3-x86_64-50' |