Skip to content

Commit

Permalink
ci: fix Windows build after PR 2760
Browse files Browse the repository at this point in the history
  • Loading branch information
canepat committed Mar 6, 2025
1 parent 08072de commit 25d9345
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions cmake/conan.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion cmake/profiles/windows_msvc_193_debug
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion cmake/profiles/windows_msvc_193_release
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 25d9345

Please sign in to comment.