migrate to catch3

mixxxdj · Sep 27, 2023 · cc20868 · cc20868
1 parent 7bd073b
commit cc20868
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 27 deletions.
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -1,5 +1,4 @@
 add_executable(keyfinder-tests
-    main.cpp
     _testhelpers.cpp
     audiodatatest.cpp
     binodetest.cpp
@@ -27,10 +26,10 @@ if(NOT TARGET Catch2::Catch2)
     FetchContent_Declare(
       Catch2
       GIT_REPOSITORY https://github.com/catchorg/Catch2.git
-      GIT_TAG        v2.13.4)
+      GIT_TAG        v3.3.2)
     FetchContent_MakeAvailable(Catch2)
     list(APPEND CMAKE_MODULE_PATH ${catch2_SOURCE_DIR}/contrib)
 endif()
-target_link_libraries(keyfinder-tests PRIVATE Catch2::Catch2)
+target_link_libraries(keyfinder-tests PRIVATE Catch2::Catch2WithMain)
 include(Catch)
 catch_discover_tests(keyfinder-tests)
diff --git a/tests/_testhelpers.h b/tests/_testhelpers.h
@@ -23,7 +23,7 @@
 #define TESTHELPERS_H
 
 #include <cmath>
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include "keyfinder.h"
 
 // all of this is a bit weak.

diff --git a/tests/main.cpp b/tests/main.cpp