From bcada10a9e591481f2f17da512b18051a75e7255 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Tue, 15 Feb 2022 15:12:58 +0100 Subject: coin: Use configure for Windows MinGW + GCC configurations Use the configure script to configure Qt in the CI, instead of calling CMake directly. As a drive-by, remove the qt tiff option from qtbase configure args. The feature is only available in qtimageformats. Amends a97bdde4d485fe0bde1a12c4307ae72a35b54c46 and 4b4f0be08debcfde62caf4066222b348ce65dea1 Pick-to: 6.2 6.3 6.4 Task-number: QTQAINFRA-4357 Task-number: QTQAINFRA-4815 Change-Id: I722bd869315b9059f5cadc5e935ed5173edf370d Reviewed-by: Alexey Edelev --- coin/platform_configs/cmake_platforms.yaml | 34 +++++++++++++++++++----------- 1 file changed, 22 insertions(+), 12 deletions(-) (limited to 'coin/platform_configs/cmake_platforms.yaml') diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index b0dca618..0452a323 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -150,13 +150,15 @@ Configurations: Id: 'Windows10_21H2-Mingw11-x64-host' Template: 'qtci-windows-10_21H2-x86_64-51' Compiler: 'Mingw' - Features: ['Packaging', 'Sccache'] - Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DQT_BUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DFEATURE_system_tiff=OFF -DFEATURE_system_freetype=OFF -DFEATURE_system_jpeg=OFF -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..' + Features: ['Packaging', 'Sccache', 'UseConfigure'] + Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples -qt-zlib -qt-freetype -qt-libjpeg' Environment variables: [ 'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}', - 'NON_QTBASE_CONFIGURE_ARGS=-DFEATURE_system_tiff=OFF', + 'CMAKE_ARGS=-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..', + 'NON_QTBASE_CMAKE_ARGS=-DFEATURE_system_tiff=OFF', 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}', - 'CONAN_PROFILE=coin/conan/profiles/ci-windows-x86_64-mingw'] + 'CONAN_PROFILE=coin/conan/profiles/ci-windows-x86_64-mingw' + ] - Id: 'Windows10_21H2-LLVM-x64-host' Template: 'qtci-windows-10_21H2-x86_64-51' @@ -176,14 +178,22 @@ Configurations: - Template: 'qtci-windows-10_21H2-x86_64-51' Compiler: 'Mingw' - Features: ['Sccache', 'WarningsAreErrors'] - Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DQT_BUILD_EXAMPLES=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DFEATURE_system_tiff=OFF -DFEATURE_system_freetype=OFF -DFEATURE_system_jpeg=OFF' - Environment variables: ['Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}', 'NON_QTBASE_CONFIGURE_ARGS=-DFEATURE_system_tiff=OFF', - 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}'] + Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure'] + Configure arguments: '-developer-build -release -force-debug-info -separate-debug-info -make examples -qt-zlib -qt-freetype -qt-libjpeg' + Environment variables: [ + 'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}', + 'CMAKE_ARGS=-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..', + 'NON_QTBASE_CMAKE_ARGS=-DFEATURE_system_tiff=OFF', + 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}' + ] - Template: 'qtci-windows-11_21H2-x86_64-51' Compiler: 'Mingw' - Features: ['Sccache', 'WarningsAreErrors'] - Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DQT_BUILD_EXAMPLES=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DFEATURE_system_tiff=OFF -DFEATURE_system_freetype=OFF -DFEATURE_system_jpeg=OFF' - Environment variables: ['Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}', 'NON_QTBASE_CONFIGURE_ARGS=-DFEATURE_system_tiff=OFF', - 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}'] + Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure'] + Configure arguments: '-developer-build -release -force-debug-info -separate-debug-info -make examples -qt-zlib -qt-freetype -qt-libjpeg' + Environment variables: [ + 'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}', + 'CMAKE_ARGS=-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..', + 'NON_QTBASE_CMAKE_ARGS=-DFEATURE_system_tiff=OFF', + 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}' + ] -- cgit v1.2.3