From 034b5f9a1e14090428bc043129d239b80150a245 Mon Sep 17 00:00:00 2001 From: offa <8887756+offa@users.noreply.github.com> Date: Wed, 8 Apr 2026 19:27:28 +0200 Subject: [PATCH] Update Catch 3.14 --- conanfile.py | 2 +- test/CMakeLists.txt | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/conanfile.py b/conanfile.py index 09df4af..60f0254 100644 --- a/conanfile.py +++ b/conanfile.py @@ -56,7 +56,7 @@ def set_version(self): def requirements(self): if self.options.unittest: - self.requires("catch2/3.13.0") + self.requires("catch2/3.14.0") self.requires("trompeloeil/49") def generate(self): diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 5d6ab01..1793bd3 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -6,11 +6,6 @@ function(add_test_suite name) add_executable(${name} ${name}.cpp) target_link_libraries(${name} PRIVATE ScopeGuard Catch2::Catch2WithMain trompeloeil::trompeloeil) add_test(${name} ${name}) - - # Workaround for catch2 #3076 - if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL "22") - target_compile_options(${name} PRIVATE -Wno-c2y-extensions) - endif() endfunction()