Update CMake integration for Catch v3.1.0

tests/unit/CMakeLists.txt

@@ -4,14 +4,14 @@ add_custom_target(tests)
 add_compile_definitions(UNITTEST)
 
 # include catch_discover_tests function from Catch2
-include(${Catch2_SOURCE_DIR}/contrib/Catch.cmake)
+include(${Catch2_SOURCE_DIR}/extras/Catch.cmake)
 
 add_library(catch_main ${CMAKE_CURRENT_SOURCE_DIR}/test_main.cpp)
-target_link_libraries(catch_main Catch2::Catch2)
+target_link_libraries(catch_main Catch2::Catch2WithMain)
 
 # registers given target as a catch test
 function(add_catch_test target)
-  target_link_libraries(${target} catch_main Catch2::Catch2)
+  target_link_libraries(${target} catch_main Catch2::Catch2WithMain)
   catch_discover_tests(${target})
   add_dependencies(tests ${target})
 endfunction()

tests/unit/application/test_application.cpp

@@ -1,4 +1,4 @@
-#include "catch2/catch.hpp"
+#include "catch2/catch_all.hpp"
 #include "application.h"
 #include <stdint.h>
 #include "../modules/stubs/stub_serial.h"

tests/unit/application/test_registers.cpp

@@ -1,4 +1,4 @@
-#include "catch2/catch.hpp"
+#include "catch2/catch_all.hpp"
 #include "registers.h"
 #include "modules/globals.h"
 #include "../modules/stubs/stub_eeprom.h"

tests/unit/hal/circular_buffer/test_circular_buffer.cpp

@@ -1,4 +1,4 @@
-#include "catch2/catch.hpp"
+#include "catch2/catch_all.hpp"
 #include "circular_buffer.h"
 
 using Catch::Matchers::Equals;
@@ -85,7 +85,7 @@ TEST_CASE("circular_buffer::wrap_around", "[circular_buffer]") {
     // loop to test the internal cursor wrap-around logic
     // the number of loops needs to be equal or greater than the index type
     for (auto loop = 0; loop != 256; ++loop) {
-        INFO("loop " << loop)
+        INFO("loop " << loop);
 
         // ensure we can fill the buffer
         for (auto i = 0; i != size; ++i) {

tests/unit/hal/progmem/test_progmem.cpp

@@ -1,4 +1,4 @@
-#include "catch2/catch.hpp"
+#include "catch2/catch_all.hpp"
 #include "progmem.h"
 
 using Catch::Matchers::Equals;

tests/unit/logic/cut_filament/test_cut_filament.cpp

@@ -1,4 +1,4 @@
-#include "catch2/catch.hpp"
+#include "catch2/catch_all.hpp"
 
 #include "../../../../src/modules/buttons.h"
 #include "../../../../src/modules/finda.h"

tests/unit/logic/eject_filament/test_eject_filament.cpp

@@ -1,4 +1,4 @@
-#include "catch2/catch.hpp"
+#include "catch2/catch_all.hpp"
 
 #include "../../../../src/modules/buttons.h"
 #include "../../../../src/modules/finda.h"

tests/unit/logic/failing_tmc/test_failing_tmc.cpp

@@ -2,7 +2,7 @@
 // As a base for this test, unload_filament was chosen.
 // Moreover, I didn't want to spoil the unit tests of the state machines themself with this.
 
-#include "catch2/catch.hpp"
+#include "catch2/catch_all.hpp"
 
 #include "../../../../src/modules/buttons.h"
 #include "../../../../src/modules/finda.h"

tests/unit/logic/feed_to_bondtech/test_feed_to_bondtech.cpp

@@ -1,4 +1,4 @@
-#include "catch2/catch.hpp"
+#include "catch2/catch_all.hpp"
 
 #include "../../../../src/modules/buttons.h"
 #include "../../../../src/modules/finda.h"

tests/unit/logic/feed_to_finda/test_feed_to_finda.cpp

@@ -1,4 +1,4 @@
-#include "catch2/catch.hpp"
+#include "catch2/catch_all.hpp"
 
 #include "../../../../src/modules/buttons.h"
 #include "../../../../src/modules/finda.h"

tests/unit/logic/homing/test_homing.cpp

@@ -1,4 +1,4 @@
-#include "catch2/catch.hpp"
+#include "catch2/catch_all.hpp"
 
 #include "../../../../src/modules/buttons.h"
 #include "../../../../src/modules/finda.h"

tests/unit/logic/load_filament/test_load_filament.cpp

@@ -1,4 +1,4 @@
-#include "catch2/catch.hpp"
+#include "catch2/catch_all.hpp"
 
 #include "../../../../src/modules/buttons.h"
 #include "../../../../src/modules/finda.h"

tests/unit/logic/stubs/main_loop_stub.cpp

@@ -1,4 +1,4 @@
-#include "catch2/catch.hpp"
+#include "catch2/catch_all.hpp"
 #include "main_loop_stub.h"
 #include "homing.h"
 

tests/unit/logic/tool_change/test_tool_change.cpp

@@ -1,4 +1,4 @@
-#include "catch2/catch.hpp"
+#include "catch2/catch_all.hpp"
 
 #include "../../../../src/modules/buttons.h"
 #include "../../../../src/modules/finda.h"

tests/unit/logic/unload_filament/test_unload_filament.cpp

@@ -1,4 +1,4 @@
-#include "catch2/catch.hpp"
+#include "catch2/catch_all.hpp"
 
 #include "../../../../src/modules/buttons.h"
 #include "../../../../src/modules/finda.h"

tests/unit/logic/unload_to_finda/test_unload_to_finda.cpp

@@ -1,4 +1,4 @@
-#include "catch2/catch.hpp"
+#include "catch2/catch_all.hpp"
 
 #include <functional>
 

tests/unit/modules/buttons/test_buttons.cpp

@@ -1,4 +1,4 @@
-#include "catch2/catch.hpp"
+#include "catch2/catch_all.hpp"
 #include "../stubs/stub_adc.h"
 #include "../stubs/stub_timebase.h"
 #include "buttons.h"

tests/unit/modules/leds/test_leds.cpp

@@ -1,4 +1,4 @@
-#include "catch2/catch.hpp"
+#include "catch2/catch_all.hpp"
 #include "leds.h"
 #include "shr16.h"
 #include "../stubs/stub_timebase.h"

tests/unit/modules/motion/test_motion.cpp

@@ -1,4 +1,4 @@
-#include "catch2/catch.hpp"
+#include "catch2/catch_all.hpp"
 #include "motion.h"
 
 using namespace modules::motion;

tests/unit/modules/protocol/test_protocol.cpp

@@ -1,4 +1,4 @@
-#include "catch2/catch.hpp"
+#include "catch2/catch_all.hpp"
 #include "../logic/error_codes.h"
 #include "../logic/progress_codes.h"
 #include "protocol.h"

tests/unit/modules/pulse_gen/test_pulse_gen.cpp

@@ -1,4 +1,4 @@
-#include "catch2/catch.hpp"
+#include "catch2/catch_all.hpp"
 #include "pulse_gen.h"
 #include "../pins.h"
 #include <stdio.h>

tests/unit/modules/speed_table/test_speed_table.cpp

@@ -1,4 +1,4 @@
-#include "catch2/catch.hpp"
+#include "catch2/catch_all.hpp"
 #include "speed_table.h"
 #include <stdio.h>
 

tests/unit/modules/stubs/stub_eeprom.cpp

@@ -1,4 +1,4 @@
-#include "catch2/catch.hpp"
+#include "catch2/catch_all.hpp"
 
 #include "../../../../src/hal/eeprom.h"
 #include "stub_eeprom.h"

tests/unit/modules/timebase/test_timebase.cpp

@@ -1,4 +1,4 @@
-#include "catch2/catch.hpp"
+#include "catch2/catch_all.hpp"
 #include "timebase.h"
 #include "../stubs/stub_timebase.h"
 

tests/unit/modules/user_input/test_user_input.cpp

@@ -1,4 +1,4 @@
-#include "catch2/catch.hpp"
+#include "catch2/catch_all.hpp"
 #include "../stubs/stub_adc.h"
 #include "../stubs/stub_timebase.h"
 #include "buttons.h"

tests/unit/system_test.cpp

@@ -1,4 +1,4 @@
-#include "catch2/catch.hpp"
+#include "catch2/catch_all.hpp"
 
 TEST_CASE("type tests", "[system]") {
     REQUIRE(sizeof(uint64_t) == 8);

tests/unit/test_main.cpp

@@ -1,3 +1,2 @@
-#define CATCH_CONFIG_MAIN
 //#define CATCH_CONFIG_ENABLE_BENCHMARKING
-#include "catch2/catch.hpp"
+#include "catch2/catch_all.hpp"