Update Catch2 to version 3.2.1

cpp-best-practices · Jan 26, 2023 · c55d340 · c55d340
1 parent 9f45cc4
commit c55d340
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 16 deletions.
diff --git a/conanfile.txt b/conanfile.txt
@@ -1,7 +1,7 @@
 # Docs at https://docs.conan.io/en/latest/reference/conanfile_txt.html
 
 [requires]
-catch2/2.13.9
+catch2/3.2.1
 cli11/2.2.0
 spdlog/1.10.0
 

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -28,10 +28,6 @@ find_package(Catch2 CONFIG REQUIRED)
 
 include(Catch)
 
-add_library(catch_main OBJECT catch_main.cpp)
-target_link_libraries(catch_main PUBLIC Catch2::Catch2)
-target_link_libraries(catch_main PRIVATE myproject::project_options)
-
 # Provide a simple smoke test to make sure that the CLI works and can display a --help message
 add_test(NAME cli.has_help COMMAND intro --help)
 
@@ -43,7 +39,7 @@ add_test(NAME cli.version_matches COMMAND intro --version)
 set_tests_properties(cli.version_matches PROPERTIES PASS_REGULAR_EXPRESSION "${PROJECT_VERSION}")
 
 add_executable(tests tests.cpp)
-target_link_libraries(tests PRIVATE myproject::project_warnings myproject::project_options catch_main)
+target_link_libraries(tests PRIVATE myproject::project_warnings myproject::project_options Catch2::Catch2WithMain)
 
 # automatically discover tests that are defined in catch based test files you can modify the unittests. Set TEST_PREFIX
 # to whatever you want, or use different for different binaries
@@ -52,7 +48,7 @@ catch_discover_tests(
   TEST_PREFIX
   "unittests."
   REPORTER
-  xml
+  XML
   OUTPUT_DIR
   .
   OUTPUT_PREFIX
@@ -62,14 +58,14 @@ catch_discover_tests(
 
 # Add a file containing a set of constexpr tests
 add_executable(constexpr_tests constexpr_tests.cpp)
-target_link_libraries(constexpr_tests PRIVATE myproject::project_options myproject::project_warnings catch_main)
+target_link_libraries(constexpr_tests PRIVATE myproject::project_options myproject::project_warnings Catch2::Catch2WithMain)
 
 catch_discover_tests(
   constexpr_tests
   TEST_PREFIX
   "constexpr."
   REPORTER
-  xml
+  XML
   OUTPUT_DIR
   .
   OUTPUT_PREFIX
@@ -80,15 +76,15 @@ catch_discover_tests(
 # Disable the constexpr portion of the test, and build again this allows us to have an executable that we can debug when
 # things go wrong with the constexpr testing
 add_executable(relaxed_constexpr_tests constexpr_tests.cpp)
-target_link_libraries(relaxed_constexpr_tests PRIVATE myproject::project_options myproject::project_warnings catch_main)
+target_link_libraries(relaxed_constexpr_tests PRIVATE myproject::project_options myproject::project_warnings Catch2::Catch2WithMain)
 target_compile_definitions(relaxed_constexpr_tests PRIVATE -DCATCH_CONFIG_RUNTIME_STATIC_REQUIRE)
 
 catch_discover_tests(
   relaxed_constexpr_tests
   TEST_PREFIX
   "relaxed_constexpr."
   REPORTER
-  xml
+  XML
   OUTPUT_DIR
   .
   OUTPUT_PREFIX

diff --git a/test/catch_main.cpp b/test/catch_main.cpp
diff --git a/test/constexpr_tests.cpp b/test/constexpr_tests.cpp
@@ -1,4 +1,4 @@
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 constexpr unsigned int Factorial(unsigned int number)// NOLINT(misc-no-recursion)
 {

diff --git a/test/tests.cpp b/test/tests.cpp
@@ -1,4 +1,4 @@
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 unsigned int Factorial(unsigned int number)// NOLINT(misc-no-recursion)
 {