From 25d934537e4be32ecbff4045576305cf369faf31 Mon Sep 17 00:00:00 2001 From: canepat <16927169+canepat@users.noreply.github.com> Date: Thu, 6 Mar 2025 09:00:45 +0100 Subject: [PATCH] ci: fix Windows build after PR 2760 --- cmake/conan.cmake | 1 + cmake/profiles/windows_msvc_193_debug | 2 +- cmake/profiles/windows_msvc_193_release | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/cmake/conan.cmake b/cmake/conan.cmake index d033b99669..db188873e1 100644 --- a/cmake/conan.cmake +++ b/cmake/conan.cmake @@ -147,6 +147,7 @@ if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows") # most Windows packages on ConanCenter are built for cppstd=14, but some packages require at least cppstd=17 # (otherwise report "Invalid" status) list(APPEND CONAN_SETTINGS "asio-grpc/*:compiler.cppstd=17") + list(APPEND CONAN_SETTINGS "catch2/*:compiler.cppstd=17") list(APPEND CONAN_SETTINGS "magic_enum/*:compiler.cppstd=17") list(APPEND CONAN_SETTINGS "tomlplusplus/*:compiler.cppstd=17") endif() diff --git a/cmake/profiles/windows_msvc_193_debug b/cmake/profiles/windows_msvc_193_debug index 403bfd8a9b..86bf46cfe9 100644 --- a/cmake/profiles/windows_msvc_193_debug +++ b/cmake/profiles/windows_msvc_193_debug @@ -5,5 +5,5 @@ compiler=msvc compiler.version=193 compiler.runtime=dynamic compiler.runtime_type=Release -compiler.cppstd=20 +compiler.cppstd=14 build_type=Debug diff --git a/cmake/profiles/windows_msvc_193_release b/cmake/profiles/windows_msvc_193_release index 5ef95c51a8..14b080f211 100644 --- a/cmake/profiles/windows_msvc_193_release +++ b/cmake/profiles/windows_msvc_193_release @@ -5,5 +5,5 @@ compiler=msvc compiler.version=193 compiler.runtime=dynamic compiler.runtime_type=Release -compiler.cppstd=20 +compiler.cppstd=14 build_type=Release