diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2022-04-19 16:30:45 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-06-09 17:15:26 +0000 |
| commit | 660cc3716d0bd599047e1e381c3f42e18970ce8d (patch) | |
| tree | 42512cbb116b1d97add1a198e06e04eb6dfaf626 | |
| parent | 01af766dc591f560d1af3fa4ed8635e4bb0df103 (diff) | |
coin: Use configure for static tests 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: I2d35724074f4180775ca28c4befea1b9de838ecf
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
(cherry picked from commit 2566bbfe717453e0c08f8453604b293b816170c8)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | coin/platform_configs/cmake_platforms_static_tests.yaml | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/coin/platform_configs/cmake_platforms_static_tests.yaml b/coin/platform_configs/cmake_platforms_static_tests.yaml index fc0c5a9f..086fa4f4 100644 --- a/coin/platform_configs/cmake_platforms_static_tests.yaml +++ b/coin/platform_configs/cmake_platforms_static_tests.yaml @@ -3,18 +3,22 @@ Configurations: - Template: 'qtci-linux-SLES-15_SP3-x86_64-51' Compiler: 'GCC' - Features: ['Sccache', 'MinimalStaticTests'] - Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DBUILD_SHARED_LIBS=OFF -DFEATURE_sql_mysql=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}' + Features: ['Sccache', 'MinimalStaticTests', 'UseConfigure'] + Configure arguments: '-nomake examples -static -no-sql-mysql' + Environment variables: [ + 'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}' + ] - Template: 'qtci-windows-10_21H2-x86_64-51' Compiler: 'MSVC2019' - Features: ['Sccache', 'MinimalStaticTests'] - Configure arguments: '-G"Ninja" -DCMAKE_BUILD_TYPE="RelWithDebInfo" -DBUILD_SHARED_LIBS=OFF -DFEATURE_msvc_obj_debug_info=ON -DQT_BUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF' + Features: ['Sccache', 'MinimalStaticTests', 'UseConfigure'] + Configure arguments: '-release -force-debug-info -static -nomake examples -qt-zlib' Environment variables: [ + 'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..', 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}' ] - Template: 'qtci-macos-11-x86_64-104' Compiler: 'Clang' - Features: ['Sccache', 'MinimalStaticTests'] - Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_SHARED_LIBS=OFF -DFEATURE_framework=OFF' + Features: ['Sccache', 'MinimalStaticTests', 'UseConfigure'] + Configure arguments: '-nomake examples -release -force-debug-info -static -no-framework' |