Switch to system Catch2

In case the tests are enabled, require a system installed version of Catch2: - find it using its CMake config file - use the Catch2::Catch2 CMake target - switch the includes to the canonical form <catch2/catch.hpp> - stop using the tools/include subdirectory in the include path Also adapt the Nix configuration for this.
arximboldi · Jul 30, 2023 · df25da6 · df25da6
1 parent 33803ba
commit df25da6
Show file tree

Hide file tree

Showing 33 changed files with 34 additions and 32 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -77,9 +77,10 @@ endif()
 
 # the library, local development target
 if(lager_BUILD_TESTS)
+  find_package(Catch2 REQUIRED)
+
   add_library(lager-dev INTERFACE)
   target_include_directories(lager-dev SYSTEM INTERFACE
-    "$<BUILD_INTERFACE:${lager_SOURCE_DIR}/>/tools/include"
     ${lager_SOURCE_DIR}
     ${Boost_INCLUDE_DIR}
   )

diff --git a/shell.nix b/shell.nix
@@ -36,6 +36,7 @@ in
 theStdenv.mkDerivation rec {
   name = "lager-env";
   buildInputs = [
+    catch2
     cmake
     ccache
     ncurses

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -63,7 +63,7 @@ foreach(_file IN LISTS lager_unit_tests)
   set_target_properties(${_target} PROPERTIES OUTPUT_NAME ${_output})
   add_dependencies(tests ${_target})
   target_compile_definitions(${_target} PUBLIC CATCH_CONFIG_MAIN)
-  target_link_libraries(${_target} PUBLIC lager-dev ${_qt_libs})
+  target_link_libraries(${_target} PUBLIC lager-dev Catch2::Catch2 ${_qt_libs})
   add_test("test/${_output}" ${_output})
 endforeach()
 

diff --git a/test/cereal/immer_array.cpp b/test/cereal/immer_array.cpp
@@ -11,7 +11,7 @@
 //
 
 #include "cerealize.hpp"
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 #include <lager/extra/cereal/immer_array.hpp>
 
 TEST_CASE("basic")

diff --git a/test/cereal/immer_box.cpp b/test/cereal/immer_box.cpp
@@ -11,7 +11,7 @@
 //
 
 #include "cerealize.hpp"
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 #include <lager/extra/cereal/immer_box.hpp>
 
 TEST_CASE("basic")

diff --git a/test/cereal/immer_flex_vector.cpp b/test/cereal/immer_flex_vector.cpp
@@ -11,7 +11,7 @@
 //
 
 #include "cerealize.hpp"
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 #include <lager/extra/cereal/immer_flex_vector.hpp>
 
 TEST_CASE("basic")

diff --git a/test/cereal/immer_vector.cpp b/test/cereal/immer_vector.cpp
@@ -11,7 +11,7 @@
 //
 
 #include "cerealize.hpp"
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 #include <lager/extra/cereal/immer_vector.hpp>
 
 TEST_CASE("basic")

diff --git a/test/cereal/tuple.cpp b/test/cereal/tuple.cpp
@@ -11,7 +11,7 @@
 //
 
 #include "cerealize.hpp"
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 #include <lager/extra/cereal/tuple.hpp>
 
 TEST_CASE("basic")

diff --git a/test/cereal/variant_with_name.cpp b/test/cereal/variant_with_name.cpp
@@ -11,7 +11,7 @@
 //
 
 #include "cerealize.hpp"
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 #include <lager/extra/cereal/variant_with_name.hpp>
 
 TEST_CASE("basic")

diff --git a/test/core.cpp b/test/core.cpp
@@ -10,7 +10,7 @@
 // or here: <https://github.com/arximboldi/lager/blob/master/LICENSE>
 //
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 #include <lager/event_loop/manual.hpp>
 #include <lager/store.hpp>

diff --git a/test/cursor.cpp b/test/cursor.cpp
@@ -10,7 +10,7 @@
 // or here: <https://github.com/arximboldi/lager/blob/master/LICENSE>
 //
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 #include <lager/constant.hpp>
 #include <lager/cursor.hpp>

diff --git a/test/debug.cpp b/test/debug.cpp
@@ -10,7 +10,7 @@
 // or here: <https://github.com/arximboldi/lager/blob/master/LICENSE>
 //
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 #include <lager/debug/debugger.hpp>
 #include <lager/event_loop/manual.hpp>

diff --git a/test/deps.cpp b/test/deps.cpp
@@ -10,7 +10,7 @@
 // or here: <https://github.com/arximboldi/lager/blob/master/LICENSE>
 //
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 #include <lager/deps.hpp>
 

diff --git a/test/detail/nodes.cpp b/test/detail/nodes.cpp
@@ -10,7 +10,7 @@
 // or here: <https://github.com/arximboldi/lager/blob/master/LICENSE>
 //
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 #include "../spies.hpp"
 

diff --git a/test/errors.cpp b/test/errors.cpp
@@ -10,7 +10,7 @@
 // or here: <https://github.com/arximboldi/lager/blob/master/LICENSE>
 //
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 #include <lager/deps.hpp>
 #include <lager/store.hpp>

diff --git a/test/event_loop/boost_asio.cpp b/test/event_loop/boost_asio.cpp
@@ -10,7 +10,7 @@
 // or here: <https://github.com/arximboldi/lager/blob/master/LICENSE>
 //
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 #include <lager/event_loop/boost_asio.hpp>
 #include <lager/store.hpp>

diff --git a/test/event_loop/manual.cpp b/test/event_loop/manual.cpp
@@ -10,7 +10,7 @@
 // or here: <https://github.com/arximboldi/lager/blob/master/LICENSE>
 //
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 #include <lager/event_loop/manual.hpp>
 #include <lager/store.hpp>

diff --git a/test/event_loop/qml.cpp b/test/event_loop/qml.cpp
@@ -10,7 +10,7 @@
 // or here: <https://github.com/arximboldi/lager/blob/master/LICENSE>
 //
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 #include <lager/event_loop/qml.hpp>
 #include <lager/store.hpp>

diff --git a/test/event_loop/qt.cpp b/test/event_loop/qt.cpp
@@ -10,7 +10,7 @@
 // or here: <https://github.com/arximboldi/lager/blob/master/LICENSE>
 //
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 #include <QCoreApplication>
 

diff --git a/test/event_loop/queue.cpp b/test/event_loop/queue.cpp
@@ -10,7 +10,7 @@
 // or here: <https://github.com/arximboldi/lager/blob/master/LICENSE>
 //
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 #include <lager/event_loop/queue.hpp>
 #include <lager/store.hpp>

diff --git a/test/event_loop/safe_queue.cpp b/test/event_loop/safe_queue.cpp
@@ -10,7 +10,7 @@
 // or here: <https://github.com/arximboldi/lager/blob/master/LICENSE>
 //
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 #include <lager/event_loop/safe_queue.hpp>
 #include <lager/store.hpp>

diff --git a/test/extra/derive.cpp b/test/extra/derive.cpp
@@ -12,7 +12,7 @@
 
 #include "test/cereal/cerealize.hpp"
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 #include <lager/extra/derive.hpp>
 #include <lager/extra/derive/cereal.hpp>

diff --git a/test/extra/enum.cpp b/test/extra/enum.cpp
@@ -11,7 +11,7 @@
 //
 
 #include "test/cereal/cerealize.hpp"
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 #include <lager/extra/cereal/enum.hpp>
 #include <lager/extra/enum.hpp>

diff --git a/test/extra/struct.cpp b/test/extra/struct.cpp
@@ -11,7 +11,7 @@
 //
 
 #include "test/cereal/cerealize.hpp"
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 #include <lager/extra/cereal/struct.hpp>
 #include <lager/extra/struct.hpp>

diff --git a/test/futures.cpp b/test/futures.cpp
@@ -10,7 +10,7 @@
 // or here: <https://github.com/arximboldi/lager/blob/master/LICENSE>
 //
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 #include <lager/event_loop/queue.hpp>
 #include <lager/store.hpp>

diff --git a/test/lenses.cpp b/test/lenses.cpp
@@ -10,7 +10,7 @@
 // or here: <https://github.com/arximboldi/lager/blob/master/LICENSE>
 //
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 #include <immer/vector.hpp>
 #include <zug/compose.hpp>

diff --git a/test/sensor.cpp b/test/sensor.cpp
@@ -10,7 +10,7 @@
 // or here: <https://github.com/arximboldi/lager/blob/master/LICENSE>
 //
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 #include <lager/sensor.hpp>
 #include <lager/state.hpp>

diff --git a/test/setter.cpp b/test/setter.cpp
@@ -10,7 +10,7 @@
 // or here: <https://github.com/arximboldi/lager/blob/master/LICENSE>
 //
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 #include <lager/event_loop/manual.hpp>
 

diff --git a/test/state.cpp b/test/state.cpp
@@ -12,7 +12,7 @@
 
 #include <boost/operators.hpp>
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 #include <lager/state.hpp>
 

diff --git a/test/type_erased_lens.cpp b/test/type_erased_lens.cpp
@@ -10,7 +10,7 @@
 // or here: <https://github.com/arximboldi/lager/blob/master/LICENSE>
 //
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 #include <vector>
 

diff --git a/test/util.cpp b/test/util.cpp
@@ -10,7 +10,7 @@
 // or here: <https://github.com/arximboldi/lager/blob/master/LICENSE>
 //
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 #include <lager/util.hpp>
 

diff --git a/test/watchers.cpp b/test/watchers.cpp
@@ -10,7 +10,7 @@
 // or here: <https://github.com/arximboldi/lager/blob/master/LICENSE>
 //
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 #include <lager/state.hpp>
 

diff --git a/test/xformed.cpp b/test/xformed.cpp
@@ -10,7 +10,7 @@
 // or here: <https://github.com/arximboldi/lager/blob/master/LICENSE>
 //
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 #include <lager/constant.hpp>
 #include <lager/state.hpp>
-Original file line number
+Diff line change
@@ Expand Up / @@ -36,6 +36,7 @@ in @@
     theStdenv.mkDerivation rec {
       name = "lager-env";
       buildInputs = [
+        catch2
         cmake
         ccache
         ncurses
@@ Expand Down @@