fixed outdated tests, improved linkage with catch2

JPenuchot · Sep 26, 2024 · 7a00486 · 7a00486
1 parent 22addbd
commit 7a00486
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 8 deletions.
diff --git a/grapher/tests/CMakeLists.txt b/grapher/tests/CMakeLists.txt
@@ -1,7 +1,7 @@
 file(GLOB_RECURSE SOURCES grapher/*.cpp)
 
-add_executable(grapher-tests ${SOURCES} main.cpp)
-target_link_libraries(grapher-tests PRIVATE Catch2::Catch2 grapher)
+add_executable(grapher-tests ${SOURCES})
+target_link_libraries(grapher-tests PRIVATE Catch2::Catch2WithMain grapher)
 
 add_custom_target(test-grapher grapher-tests)
 add_dependencies(test-all test-grapher)
diff --git a/grapher/tests/grapher/predicates.cpp b/grapher/tests/grapher/predicates.cpp
@@ -1,4 +1,4 @@
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 #include <grapher/predicates.hpp>
 

diff --git a/grapher/tests/grapher/utils/cli.cpp b/grapher/tests/grapher/utils/cli.cpp
@@ -1 +1 @@
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
diff --git a/grapher/tests/grapher/utils/json.cpp b/grapher/tests/grapher/utils/json.cpp
@@ -1 +1 @@
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
diff --git a/grapher/tests/grapher/utils/math.cpp b/grapher/tests/grapher/utils/math.cpp
@@ -1,4 +1,4 @@
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 #include <vector>
 

diff --git a/grapher/tests/main.cpp b/grapher/tests/main.cpp
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		#include <catch2/catch.hpp>
		#include <catch2/catch_test_macros.hpp>