upgrade to cath2_3

tfc · Sep 30, 2024 · a3b513d · a3b513d
1 parent 782b77f
commit a3b513d
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 13 deletions.
diff --git a/build.nix b/build.nix
@@ -1,6 +1,6 @@
 { stdenv
 , lib
-, catch2
+, catch2_3
 , clang-tools
 , cmake
 , gbenchmark
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
   };
 
   checkInputs = [
-    catch2
+    catch2_3
     gbenchmark
   ]
   ++ lib.optional stdenv.cc.isClang llvm; # for llvm-cov

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -5,15 +5,14 @@ include(Catch)
 
 add_executable(${PROJECT_NAME}-test
   gdb.cpp
-  main.cpp
   math_expression.cpp
   test.cpp
   )
 target_link_libraries(${PROJECT_NAME}-test ${PROJECT_NAME})
 target_compile_features(${PROJECT_NAME}-test INTERFACE cxx_std_17)
 target_compile_options(${PROJECT_NAME}-test
   PRIVATE -Wall -Wextra -Werror)
-target_link_libraries(${PROJECT_NAME}-test Catch2::Catch2)
+target_link_libraries(${PROJECT_NAME}-test Catch2::Catch2WithMain)
 
 catch_discover_tests(${PROJECT_NAME}-test)
 

diff --git a/test/gdb.cpp b/test/gdb.cpp
@@ -1,7 +1,7 @@
 #include <attoparsecpp/parser.hpp>
 #include <numeric>
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 using namespace apl;
 using namespace std::string_literals;

diff --git a/test/main.cpp b/test/main.cpp
diff --git a/test/math_expression.cpp b/test/math_expression.cpp
@@ -1,6 +1,6 @@
 #include <attoparsecpp/math_expression.hpp>
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 using namespace apl;
 

diff --git a/test/test.cpp b/test/test.cpp
@@ -5,7 +5,7 @@
 
 #include <attoparsecpp/parser.hpp>
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 using namespace apl;
 using namespace std::string_literals;