diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2022-04-19 14:45:14 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-06-09 17:15:26 +0000 |
| commit | 01af766dc591f560d1af3fa4ed8635e4bb0df103 (patch) | |
| tree | 4ac9e04408ad9a1fedd61f6be282dbd59fd1a3a4 | |
| parent | 12c753f66f42978814fc04b16321b14eb526270d (diff) | |
coin: Use configure for Windows MinGW + LLVM 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
Also remove redundant compiler launcher assignments.
Task-number: QTQAINFRA-4357
Task-number: QTQAINFRA-4815
Change-Id: I5cfcf5ddf60e9dd77cb67f41bb75525b44ad78d3
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
(cherry picked from commit 98bcf11bf8b8685c34adb9f4f58933f51aaf1ae4)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | coin/platform_configs/cmake_platforms.yaml | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index 4188af42..238e7ea1 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -160,18 +160,26 @@ Configurations: Id: 'Windows10_21H2-LLVM-x64-host' Template: 'qtci-windows-10_21H2-x86_64-51' Compiler: 'Clang' - Features: ['Sccache'] - Configure arguments: '-GNinja -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}}\..' - Environment variables: ['Path=C:\llvm-mingw\bin;{{.Env.Path}}', 'NON_QTBASE_CONFIGURE_ARGS=-DFEATURE_system_tiff=OFF', - 'LLVM_INSTALL_DIR=C:\llvm-mingw'] + Features: ['Sccache', 'UseConfigure'] + Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples -qt-zlib -qt-freetype -qt-libjpeg' + Environment variables: [ + 'Path=C:\llvm-mingw\bin;{{.Env.Path}}', + 'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..', + 'NON_QTBASE_CMAKE_ARGS=-DFEATURE_system_tiff=OFF', + 'LLVM_INSTALL_DIR=C:\llvm-mingw' + ] - Id: 'Windows11_21H2-LLVM-x64-host' Template: 'qtci-windows-11_21H2-x86_64-51' Compiler: 'Clang' - Features: ['Sccache'] - Configure arguments: '-GNinja -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 -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..' - Environment variables: ['Path=C:\llvm-mingw\bin;{{.Env.Path}}', 'NON_QTBASE_CONFIGURE_ARGS=-DFEATURE_system_tiff=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache', - 'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache', 'LLVM_INSTALL_DIR=C:\llvm-mingw'] + Features: ['Sccache', 'UseConfigure'] + Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples -qt-zlib -qt-freetype -qt-libjpeg' + Environment variables: [ + 'Path=C:\llvm-mingw\bin;{{.Env.Path}}', + 'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..', + 'NON_QTBASE_CMAKE_ARGS=-DFEATURE_system_tiff=OFF', + 'LLVM_INSTALL_DIR=C:\llvm-mingw' + ] - Template: 'qtci-windows-10_21H2-x86_64-51' Compiler: 'Mingw' |