Use Catch2 amalgamated file

This is to avoid the compilation of a gazillion files for Catch2
pierre-dejoue · Aug 11, 2023 · f9130f4 · f9130f4
1 parent 6819470
commit f9130f4
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 13 deletions.
diff --git a/cmake/third_party/catch2.cmake b/cmake/third_party/catch2.cmake
@@ -8,7 +8,19 @@ Include(FetchContent)
 FetchContent_Declare(
     catch2
     GIT_REPOSITORY https://github.com/catchorg/Catch2.git
-    GIT_TAG        v3.2.0
+    GIT_TAG        v3.4.0
 )
 
-FetchContent_MakeAvailable(catch2)
+FetchContent_Populate(catch2)
+
+add_library(Catch2WithMain STATIC
+    ${catch2_SOURCE_DIR}/extras/catch_amalgamated.cpp
+    ${catch2_SOURCE_DIR}/extras/catch_amalgamated.hpp
+)
+
+target_include_directories(Catch2WithMain
+    PUBLIC
+    ${catch2_SOURCE_DIR}/extras
+)
+
+add_library(Catch2::Catch2WithMain ALIAS Catch2WithMain)
diff --git a/src/tests/picross/src/bench_line_alternatives.cpp b/src/tests/picross/src/bench_line_alternatives.cpp
@@ -1,5 +1,4 @@
-#include <catch2/benchmark/catch_benchmark_all.hpp>
-#include <catch2/catch_test_macros.hpp>
+#include <catch_amalgamated.hpp>
 #include <picross/picross.h>
 #include <utils/test_helpers.h>
 #include <utils/text_io.h>

diff --git a/src/tests/picross/src/bench_solver.cpp b/src/tests/picross/src/bench_solver.cpp
@@ -1,5 +1,4 @@
-#include <catch2/benchmark/catch_benchmark_all.hpp>
-#include <catch2/catch_test_macros.hpp>
+#include <catch_amalgamated.hpp>
 #include <picross/picross.h>
 #include <utils/text_io.h>
 

diff --git a/src/tests/picross/src/test_binomial.cpp b/src/tests/picross/src/test_binomial.cpp
@@ -1,4 +1,4 @@
-#include <catch2/catch_test_macros.hpp>
+#include <catch_amalgamated.hpp>
 
 #include "binomial.h"
 

diff --git a/src/tests/picross/src/test_line_alternatives.cpp b/src/tests/picross/src/test_line_alternatives.cpp
@@ -1,4 +1,4 @@
-#include <catch2/catch_test_macros.hpp>
+#include <catch_amalgamated.hpp>
 #include <picross/picross.h>
 #include <utils/test_helpers.h>
 #include <utils/text_io.h>

diff --git a/src/tests/picross/src/test_line_constraint.cpp b/src/tests/picross/src/test_line_constraint.cpp
@@ -1,4 +1,4 @@
-#include <catch2/catch_test_macros.hpp>
+#include <catch_amalgamated.hpp>
 #include <picross/picross.h>
 #include <utils/text_io.h>
 

diff --git a/src/tests/picross/src/test_solver.cpp b/src/tests/picross/src/test_solver.cpp
@@ -1,4 +1,4 @@
-#include <catch2/catch_test_macros.hpp>
+#include <catch_amalgamated.hpp>
 #include <picross/picross.h>
 #include <utils/test_helpers.h>
 #include <utils/text_io.h>

diff --git a/src/tests/picross/src/test_utils.cpp b/src/tests/picross/src/test_utils.cpp
@@ -1,4 +1,4 @@
-#include <catch2/catch_test_macros.hpp>
+#include <catch_amalgamated.hpp>
 #include <picross/picross.h>
 #include <utils/text_io.h>
 

diff --git a/src/tests/stdutils/src/test_io.cpp b/src/tests/stdutils/src/test_io.cpp
@@ -1,4 +1,4 @@
-#include <catch2/catch_test_macros.hpp>
+#include <catch_amalgamated.hpp>
 
 #include <stdutils/io.h>
 

diff --git a/src/tests/stdutils/src/test_span.cpp b/src/tests/stdutils/src/test_span.cpp
@@ -1,4 +1,4 @@
-#include <catch2/catch_test_macros.hpp>
+#include <catch_amalgamated.hpp>
 #include <stdutils/span.h>
 
 #include <vector>