diff options
| author | Toni Saario <toni.saario@qt.io> | 2024-04-02 09:26:57 +0300 |
|---|---|---|
| committer | Toni Saario <toni.saario@qt.io> | 2024-04-02 15:45:17 +0300 |
| commit | c06ac4d550d3fe5f1bef38c7c5e05719a39c4baa (patch) | |
| tree | 57858ac76f4d6196323b738297efc841c6163246 /coin | |
| parent | 5157d1ef93d1a59f4a64c49c411f53c51a9a6d58 (diff) | |
Move c++20 to msvc2022 on windows 11 23h2
Amends f22c8e459f71da604925689f8e0216825548ef00
Change-Id: I328cd0fbe7b93c84903373224ebc8d230ea7f62f
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
Diffstat (limited to 'coin')
| -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 91d684d1..a7c12677 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -124,7 +124,7 @@ Configurations: Template: 'qtci-windows-11_23H2-x86_64-52' Compiler: 'MSVC2022' Features: ['Sccache', "DebugAndRelease", 'UseConfigure', 'InsignificantTests'] - 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 -DFEATURE_clangcpp=OFF', @@ -176,7 +176,7 @@ Configurations: Template: 'qtci-windows-11_23H2-x86_64-52' Compiler: 'MSVC2019' Features: ['Sccache', "DebugAndRelease", 'WarningsAreErrors', 'UseConfigure', 'InsignificantTests'] - 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', |