diff options
author | Heikki Halmet <heikki.halmet@qt.io> | 2022-01-12 11:35:53 +0200 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-02-01 03:58:26 +0000 |
commit | 00252d11c7068829bc17c5c5e6bae9eca2433af1 (patch) | |
tree | f1cea903a7ea527067428529899d73b538256f13 /coin | |
parent | e00ab6299edeab9e6fecfe3e69b1c6b7c70009e2 (diff) |
Make Windows 10 21H2 significant
Task-number: QTQAINFRA-4600
Change-Id: I0ffe3f94bfef9c15a1cbc98cd0afed8bf33c68c1
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit 279841383d0cd8c852bf25415aaf2747c932710d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'coin')
-rw-r--r-- | coin/platform_configs/cmake_platforms.yaml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index 8564b81e..f8c7f604 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -64,7 +64,7 @@ Configurations: - Template: 'qtci-windows-10_21H2-x86_64-51' Compiler: 'MSVC2019' - Features: ['Packaging', 'Sccache', "DebugAndRelease", "Insignificant"] + Features: ['Packaging', 'Sccache', "DebugAndRelease"] Configure arguments: '-G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DFEATURE_msvc_obj_debug_info=ON -DFEATURE_headersclean=ON -DQT_BUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..' Environment variables: [ 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}'] @@ -80,7 +80,7 @@ Configurations: - Template: 'qtci-windows-10_21H2-x86_64-51' Compiler: 'MSVC2022' - Features: ['Sccache', "DebugAndRelease", 'Insignificant'] + Features: ['Sccache', "DebugAndRelease"] Configure arguments: '-G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DFEATURE_msvc_obj_debug_info=ON -DFEATURE_headersclean=ON -DQT_BUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..' Environment variables: [ 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}' @@ -118,13 +118,13 @@ Configurations: Id: 'Windows10_21H2-MSVC2019-x64-host' Template: 'qtci-windows-10_21H2-x86_64-51' Compiler: 'MSVC2019' - Features: ['Sccache', "DebugAndRelease", "Insignificant"] + Features: ['Sccache', "DebugAndRelease"] Configure arguments: '-G"Ninja Multi-Config" -DQT_BUILD_EXAMPLES=ON -DFEATURE_developer_build=ON -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF' - Template: 'qtci-windows-10_21H2-x86_64-51' Compiler: 'MSVC2019' Target arch: 'arm64' - Features: ['Sccache', 'DisableTests', 'TargetBuildOnly', 'Packaging', 'Insignificant'] + Features: ['Sccache', 'DisableTests', 'TargetBuildOnly', 'Packaging'] Platform dependency: 'Windows10_21H2-MSVC2019-x64-host' Environment variables: [ 'TARGET_CONFIGURE_ARGS={{.Env.TARGET_CONFIGURE_ARGS}} -DQT_QMAKE_TARGET_MKSPEC=win32-arm64-msvc -G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DFEATURE_msvc_obj_debug_info=ON', |