From f9130f4558a22e07c2ab6b7b85bd99722e7531bb Mon Sep 17 00:00:00 2001
From: Pierre Dejoue <pierre.dejoue@gmail.com>
Date: Fri, 11 Aug 2023 16:27:10 +0200
Subject: [PATCH] Use Catch2 amalgamated file

This is to avoid the compilation of a gazillion files for Catch2
---
 cmake/third_party/catch2.cmake                   | 16 ++++++++++++++--
 .../picross/src/bench_line_alternatives.cpp      |  3 +--
 src/tests/picross/src/bench_solver.cpp           |  3 +--
 src/tests/picross/src/test_binomial.cpp          |  2 +-
 src/tests/picross/src/test_line_alternatives.cpp |  2 +-
 src/tests/picross/src/test_line_constraint.cpp   |  2 +-
 src/tests/picross/src/test_solver.cpp            |  2 +-
 src/tests/picross/src/test_utils.cpp             |  2 +-
 src/tests/stdutils/src/test_io.cpp               |  2 +-
 src/tests/stdutils/src/test_span.cpp             |  2 +-
 10 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/cmake/third_party/catch2.cmake b/cmake/third_party/catch2.cmake
index b9f0a46..6e87edd 100644
--- 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
index 1d12559..0e3ed5b 100644
--- 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
index a8f7ee0..859f078 100644
--- 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
index fbfb849..f61e5cb 100644
--- 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
index f69899b..bf3bd0e 100644
--- 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
index 4968f1e..35f6816 100644
--- 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
index 53fa2d6..74ed0bf 100644
--- 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
index 756441c..94542df 100644
--- 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
index c8a116e..324c53f 100644
--- 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
index 6b030a1..205856a 100644
--- 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>