diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2022-02-15 15:12:58 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-06-09 00:47:51 +0000 |
| commit | 4e5d6a7d9190a4d9981dc6dd8c4f2a3181bc4daf (patch) | |
| tree | d4133c5eea68aef2cab461c4354f4805d23e2204 /coin | |
| parent | 785e2717712eefb9370fe63052ac9c2f7d955191 (diff) | |
coin: Use configure for OpenSUSE and SLES 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: Ia2461f24ba526702196f72ea492b59cc2b1abf5a
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
(cherry picked from commit 6d6eccab3454483540f4948085a231fc7403e079)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'coin')
| -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 07b39df4..737ddd65 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -27,8 +27,8 @@ Configurations: Id: 'OpenSUSE-15.3-host' Template: 'qtci-linux-openSUSE-15.3-x86_64-50' Compiler: 'GCC' - Features: ['Sccache', 'WarningsAreErrors'] - Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DFEATURE_developer_build=ON' + Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure'] + Configure arguments: '-nomake examples -developer-build' Environment variables: [ 'PATH={{.Env.CMAKE_MIN_SUPPORTED_BIN_PATH}}:{{.Env.PATH}}', 'CONAN_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc-debug-developer' @@ -36,8 +36,11 @@ Configurations: - Template: 'qtci-linux-SLES-15_SP3-x86_64-51' Compiler: 'GCC' - Features: ['Sccache', 'DisableTests'] - Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DBUILD_SHARED_LIBS=OFF -DFEATURE_sql_mysql=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}' + Features: ['Sccache', 'DisableTests', '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' |