From 0459819d998550eca9c305461c7cf64541af9502 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Tue, 15 Feb 2022 15:12:58 +0100 Subject: [PATCH] coin: Use configure for RHEL configurations Use the configure script to configure Qt in the CI, instead of calling CMake directly. Task-number: QTQAINFRA-4357 Task-number: QTQAINFRA-4815 Change-Id: I1fef5b57c493d1e32080fad393e4e531e441e142 Reviewed-by: Alexey Edelev (cherry picked from commit 4810eb2f6120b7751b94498feaee461943e5d051) Reviewed-by: Qt Cherry-pick Bot --- coin/platform_configs/cmake_platforms.yaml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index 737ddd65..28c8c8b1 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -121,10 +121,12 @@ Configurations: Id: 'RHEL-8.4-host' Template: 'qtci-linux-RHEL-8.4-x86_64-50' Compiler: 'GCC' - Features: ['Packaging', '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 -DINPUT_bundled_xcb_xinput=yes -DOpenGL_GL_PREFERENCE=LEGACY' + Features: ['Packaging', 'Sccache', 'UseConfigure'] + Configure arguments: '-nomake examples -release -force-debug-info -headersclean -separate-debug-info -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput' Environment variables: [ - 'CONAN_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc'] + 'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY', + 'CONAN_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc' + ] - Template: 'qtci-macos-11-x86_64-104' Target os: 'IOS_ANY'