update Catch2 header and targets

stevenlovegrove · Jun 17, 2024 · 70c219d · 70c219d
1 parent 8f0f753
commit 70c219d
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 4 deletions.
diff --git a/components/pango_core/CMakeLists.txt b/components/pango_core/CMakeLists.txt
@@ -56,6 +56,6 @@ endif()
 
 if(BUILD_TESTS)
     add_executable(test_uris ${CMAKE_CURRENT_LIST_DIR}/tests/tests_uri.cpp)
-    target_link_libraries(test_uris PRIVATE Catch2::Catch2 ${COMPONENT})
+    target_link_libraries(test_uris PRIVATE Catch2::Catch2WithMain ${COMPONENT})
     catch_discover_tests(test_uris)
 endif()
diff --git a/components/pango_core/tests/tests_uri.cpp b/components/pango_core/tests/tests_uri.cpp
@@ -1,5 +1,9 @@
 #define CATCH_CONFIG_MAIN
+#if __has_include(<catch2/catch.hpp>)
 #include <catch2/catch.hpp>
+#else
+#include <catch2/catch_test_macros.hpp>
+#endif
 
 #include <string>
 #include <limits>

diff --git a/components/pango_vars/CMakeLists.txt b/components/pango_vars/CMakeLists.txt
@@ -21,6 +21,6 @@ install(DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/include"
 
 if(BUILD_TESTS)
     add_executable(test_vars ${CMAKE_CURRENT_LIST_DIR}/tests/test_all.cpp)
-    target_link_libraries(test_vars PRIVATE Catch2::Catch2 ${COMPONENT})
+    target_link_libraries(test_vars PRIVATE Catch2::Catch2WithMain ${COMPONENT})
     catch_discover_tests(test_vars)
 endif()
diff --git a/components/pango_vars/tests/test_all.cpp b/components/pango_vars/tests/test_all.cpp
@@ -1,5 +1,9 @@
 #define CATCH_CONFIG_MAIN
+#if __has_include(<catch2/catch.hpp>)
 #include <catch2/catch.hpp>
+#else
+#include <catch2/catch_test_macros.hpp>
+#endif
 
 #include <pangolin/var/var.h>
 #include <pangolin/var/varextra.h>

diff --git a/components/pango_video/CMakeLists.txt b/components/pango_video/CMakeLists.txt
@@ -237,9 +237,9 @@ target_sources(${COMPONENT} PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/include/pangoli
 
 if(BUILD_TESTS)
     add_executable(test_video_uris ${CMAKE_CURRENT_LIST_DIR}/tests/tests_video_uri.cpp)
-    target_link_libraries(test_video_uris PRIVATE Catch2::Catch2 ${COMPONENT})
+    target_link_libraries(test_video_uris PRIVATE Catch2::Catch2WithMain ${COMPONENT})
     catch_discover_tests(test_video_uris)
     add_executable(test_video_loading ${CMAKE_CURRENT_LIST_DIR}/tests/tests_video_loading.cpp)
-    target_link_libraries(test_video_loading PRIVATE Catch2::Catch2 ${COMPONENT})
+    target_link_libraries(test_video_loading PRIVATE Catch2::Catch2WithMain ${COMPONENT})
     catch_discover_tests(test_video_loading)
 endif()
diff --git a/components/pango_video/tests/tests_video_loading.cpp b/components/pango_video/tests/tests_video_loading.cpp
@@ -1,5 +1,9 @@
 #define CATCH_CONFIG_MAIN
+#if __has_include(<catch2/catch.hpp>)
 #include <catch2/catch.hpp>
+#else
+#include <catch2/catch_test_macros.hpp>
+#endif
 
 #include <pangolin/video/video.h>
 #include <pangolin/factory/factory_registry.h>

diff --git a/components/pango_video/tests/tests_video_uri.cpp b/components/pango_video/tests/tests_video_uri.cpp
@@ -1,5 +1,9 @@
 #define CATCH_CONFIG_MAIN
+#if __has_include(<catch2/catch.hpp>)
 #include <catch2/catch.hpp>
+#else
+#include <catch2/catch_test_macros.hpp>
+#endif
 
 #include <string>
 #include <limits>