From f6fd6e1b5367ff7fc8f2617c47fbdf9f650eace5 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Sat, 8 Jun 2024 17:35:09 +0200 Subject: [PATCH] Add MSVC C++20 build to dev and '6.8' - add windows-11_23H2-msvc2022-developer-build Fixes: QTBUG-127127 Change-Id: I7e21a0d1c32675d904fa873fa13a6fdd08ecf1f6 Reviewed-by: Jani Heikkinen (cherry picked from commit d571f689ab102578e9bd51f9695355231d15861b) Reviewed-by: Qt Cherry-pick Bot --- coin/platform_configs/cmake_platforms.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index 937790d2..e53aab4c 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -179,6 +179,18 @@ Configurations: 'OPENSSL_LIB_x64={{.Env.OPENSSL_LIB_x64_arm64}}', 'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}', ] +- + Id: 'windows-11_23H2-msvc2022-developer-build' + Template: 'qtci-windows-11_23H2-x86_64-53' + Compiler: 'MSVC2022' + Features: ['Sccache', 'DebugAndRelease', 'WarningsAreErrors', 'UseConfigure'] + Configure arguments: '-debug-and-release -make examples -developer-build -force-debug-info -qt-zlib -c++std c++20' + Environment variables: [ + 'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DMySQL_ROOT={{.Env.ENV_MySQL_ROOT}} -DMySQL_LIBRARY_DIR={{.Env.ENV_MySQL_LIBRARY_DIR}}', + 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}} -DQT_DEPLOY_FFMPEG=TRUE', + 'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}', + 'gRPC_ROOT={{.Env.gRPC_ROOT_msvc}}', + ] - Id: 'rhel-8.10' Template: 'qtci-linux-RHEL-8.10-x86_64-50'