Configure to use Catch2 v2 or v3

Signed-off-by: Ed Beroset <[email protected]>
beroset · Dec 18, 2023 · 9262714 · 9262714
1 parent 39c7605
commit 9262714
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 8 deletions.
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
@@ -15,7 +15,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest]
+        os: [ubuntu-latest macos-latest]
 
     steps:
     - uses: actions/checkout@v2

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -36,7 +36,7 @@ add_subdirectory(config)
 add_subdirectory(autodownload)
 
 if (WITH_TEST)
-    find_package(Catch2 2 REQUIRED)
+    find_package(Catch2 REQUIRED)
     enable_testing()
     add_subdirectory(test)
 endif() 

diff --git a/test/AutoProjectTest.cpp b/test/AutoProjectTest.cpp
@@ -1,7 +1,13 @@
 #include "AutoProject.h"
 #include "trim.h"
-#define CATCH_CONFIG_MAIN
-#include <catch2/catch.hpp>
+#if USE_CATCH2_VERSION == 2
+#  define CATCH_CONFIG_MAIN
+#  include <catch2/catch.hpp>
+#elif USE_CATCH2_VERSION == 3
+#  include <catch2/catch_test_macros.hpp>
+#else
+#  error "Catch2 version unknown"
+#endif
 
 TEST_CASE( "Trim characters and substrings", "[trim]" ) {
     SECTION("Can trim using string") {

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -15,8 +15,15 @@ endif()
 file(COPY examples DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
 target_link_directories(ConfigFileTest PRIVATE /usr/local/lib)
 target_link_directories(AutoProjectTest PRIVATE /usr/local/lib)
-target_link_libraries(ConfigFileTest PRIVATE ConfigFile Catch2::Catch2)
-target_link_libraries(AutoProjectTest PRIVATE autoproj Catch2::Catch2)
+target_compile_definitions(ConfigFileTest PRIVATE USE_CATCH2_VERSION=${Catch2_VERSION_MAJOR})
+target_compile_definitions(AutoProjectTest PRIVATE USE_CATCH2_VERSION=${Catch2_VERSION_MAJOR})
+if(${Catch2_VERSION_MAJOR} STREQUAL "2")
+    target_link_libraries(ConfigFileTest PRIVATE ConfigFile Catch2::Catch2)
+    target_link_libraries(AutoProjectTest PRIVATE autoproj Catch2::Catch2)
+else()
+    target_link_libraries(ConfigFileTest PRIVATE ConfigFile Catch2::Catch2WithMain)
+    target_link_libraries(AutoProjectTest PRIVATE autoproj Catch2::Catch2WithMain)
+endif()
 add_test(ConfigFileTest ConfigFileTest)
 add_test(AutoProjectTest AutoProjectTest)
 add_test(createRandqt ${TESTSCRIPT} examples/randqt.md)

diff --git a/test/ConfigFileTest.cpp b/test/ConfigFileTest.cpp
@@ -4,8 +4,14 @@
 #include <string>
 #include <sstream>
 #include "ConfigFile.h"
-#define CATCH_CONFIG_MAIN
-#include <catch2/catch.hpp>
+#if USE_CATCH2_VERSION == 2
+#  define CATCH_CONFIG_MAIN
+#  include <catch2/catch.hpp>
+#elif USE_CATCH2_VERSION == 3
+#  include <catch2/catch_test_macros.hpp>
+#else
+#  error "Catch2 version unknown"
+#endif
 
 
 TEST_CASE("Configuration file can be opened, read, written, queried", "[configtest]") {