diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2024-03-15 18:27:31 +0100 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2024-03-18 12:47:34 +0100 |
| commit | f22c8e459f71da604925689f8e0216825548ef00 (patch) | |
| tree | 4aca86226a09066c88c8b1df67999ecce9737202 /coin/platform_configs | |
| parent | 23ce6f4378dfc2f1075376ad7198831b8d187342 (diff) | |
CI: Turn off C++20 for MSVC2019
qtbase/45fd36f1480a6229879a4e59236ffa1d1d22dfbf triggers internal
compiler errors in MSVC2019 when configuring Qt with -c++std c++20.
Move the build-testing of the C++20 standard to
windows-11_22h2-msvc2022.
Change-Id: I7591223ae391471c61a80883f305c73e43945714
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Toni Saario <toni.saario@qt.io>
Diffstat (limited to 'coin/platform_configs')
| -rw-r--r-- | coin/platform_configs/cmake_platforms.yaml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index 89d74dce..9d464bef 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -100,7 +100,7 @@ Configurations: Template: 'qtci-windows-11_22H2-x86_64-51' Compiler: 'MSVC2022' Features: ['Sccache', "DebugAndRelease", 'UseConfigure'] - Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib' + Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib -c++std c++20' 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', @@ -140,7 +140,7 @@ Configurations: Template: 'qtci-windows-11_22H2-x86_64-51' Compiler: 'MSVC2019' Features: ['Sccache', "DebugAndRelease", 'WarningsAreErrors', 'UseConfigure'] - Configure arguments: '-debug-and-release -make examples -developer-build -force-debug-info -qt-zlib -c++std c++20' + Configure arguments: '-debug-and-release -make examples -developer-build -force-debug-info -qt-zlib' Environment variables: [ 'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..', 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}} -DQT_DEPLOY_FFMPEG=TRUE', |