From 88c5532d08a80042205cbee132d862df988af447 Mon Sep 17 00:00:00 2001 From: Jukka Jokiniva Date: Wed, 26 Jun 2024 16:44:53 +0300 Subject: [PATCH] Change msvc packaging targets back to c++17 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Packaging targets were accidentally moved to c++20. Amends bf633f08b7765140e54548eac722a46906141a40 Amends b4bcf1e6ca00b2eb7558777ecabf822673178021 Fixes: QTQAINFRA-6424 Change-Id: Iad6f8202329b471733cc1bc8ddf22feb3ffadfb4 Reviewed-by: Oliver Wolff Reviewed-by: Simo Fält (cherry picked from commit b9fdfb3fb3443f2ed1e7ba214d285c04c6903b46) Reviewed-by: Qt Cherry-pick Bot --- coin/platform_configs/cmake_platforms.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index 12cc4e7b..c0fac95b 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -99,7 +99,7 @@ Configurations: Template: 'qtci-windows-11_23H2-x86_64-52' Compiler: 'MSVC2022' Features: ['Sccache', "DebugAndRelease", 'UseConfigure', 'Packaging'] - Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib -c++std c++20' + Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib' Environment variables: [ 'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..', 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}} -DQT_DEPLOY_FFMPEG=TRUE -DFEATURE_native_grpc=OFF -DFEATURE_clangcpp=OFF -DINPUT_headersclean=ON', @@ -111,7 +111,7 @@ Configurations: Template: 'qtci-windows-11_22H2-aarch64-51' Compiler: 'MSVC2022' Features: ['Packaging', 'DebugAndRelease', 'UseConfigure', 'InsignificantTests'] - Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib -c++std c++20 -no-sql-psql -no-opengl' + Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib -no-sql-psql -no-opengl' Environment variables: [ 'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_arm64}}\..', 'NON_QTBASE_CMAKE_ARGS=-DFEATURE_native_grpc=OFF -DFEATURE_clangcpp=OFF -DFEATURE_qdoc=OFF',