test: restore compatibility with older Catch2 releases

Alexays · Feb 20, 2024 · 5d6acfd · 5d6acfd
1 parent d59d6e8
commit 5d6acfd
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/meson.build b/meson.build
@@ -558,7 +558,6 @@ endif
 
 catch2 = dependency(
     'catch2',
-    version: '>=3.5.1',
     default_options: [ 'tests=false' ],
     fallback: ['catch2', 'catch2_dep'],
     required: get_option('tests'),

diff --git a/test/css_reload_helper.cpp b/test/css_reload_helper.cpp
@@ -4,7 +4,6 @@
 
 #if __has_include(<catch2/catch_test_macros.hpp>)
 #include <catch2/catch_test_macros.hpp>
-#include <catch2/matchers/catch_matchers_all.hpp>
 #else
 #include <catch2/catch.hpp>
 #endif

diff --git a/test/date.cpp b/test/date.cpp
@@ -7,7 +7,7 @@
 
 #if __has_include(<catch2/catch_test_macros.hpp>)
 #include <catch2/catch_test_macros.hpp>
-#include <catch2/matchers/catch_matchers_all.hpp>
+#include <catch2/matchers/catch_matchers_string.hpp>
 #else
 #include <catch2/catch.hpp>
 #endif

diff --git a/test/main.cpp b/test/main.cpp
@@ -3,8 +3,9 @@
 #include <spdlog/sinks/stdout_sinks.h>
 #include <spdlog/spdlog.h>
 
-#if __has_include(<catch2/catch_all.hpp>)
-#include <catch2/catch_all.hpp>
+#if __has_include(<catch2/catch_session.hpp>)
+#include <catch2/catch_session.hpp>
+#include <catch2/catch_version_macros.hpp>
 #include <catch2/reporters/catch_reporter_tap.hpp>
 #else
 #include <catch2/catch.hpp>