Patch to use system installation of catch2.

2 files changed, 115 insertions, 0 deletions

diff --git a/debian/patches/0001-Use-system-catch2.patch b/debian/patches/0001-Use-system-catch2.patch
new file mode 100644
index 0000000..264bf46
--- /dev/null
+++ b/debian/patches/0001-Use-system-catch2.patch
@@ -0,0 +1,114 @@
+From: Gard Spreemann <gspr@nonempty.org>
+Date: Wed, 3 Jun 2020 09:32:19 +0200
+Subject: Use system catch2.
+
+---
+ bottleneck/tests/test_hera_bottleneck.cpp             | 2 +-
+ bottleneck/tests/tests_main.cpp                       | 2 +-
+ matching/tests/test_bifiltration.cpp                  | 2 +-
+ matching/tests/test_common.cpp                        | 2 +-
+ matching/tests/test_matching_distance.cpp             | 2 +-
+ matching/tests/test_module.cpp                        | 2 +-
+ matching/tests/tests_main.cpp                         | 2 +-
+ wasserstein/tests/test_hera_wasserstein.cpp           | 2 +-
+ wasserstein/tests/test_hera_wasserstein_pure_geom.cpp | 2 +-
+ wasserstein/tests/tests_main.cpp                      | 2 +-
+ 10 files changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/bottleneck/tests/test_hera_bottleneck.cpp b/bottleneck/tests/test_hera_bottleneck.cpp
+index f22e415..9fcc8d0 100644
+--- a/bottleneck/tests/test_hera_bottleneck.cpp
++++ b/bottleneck/tests/test_hera_bottleneck.cpp
+@@ -1,4 +1,4 @@
+-#include "catch/catch.hpp"
++#include <catch2/catch.hpp>
+ 
+ #include <sstream>
+ #include <iostream>
+diff --git a/bottleneck/tests/tests_main.cpp b/bottleneck/tests/tests_main.cpp
+index d24407e..1f558c8 100644
+--- a/bottleneck/tests/tests_main.cpp
++++ b/bottleneck/tests/tests_main.cpp
+@@ -1,3 +1,3 @@
+ #define LOG_AUCTION
+ #define CATCH_CONFIG_MAIN
+-#include "catch/catch.hpp"
++#include <catch2/catch.hpp>
+diff --git a/matching/tests/test_bifiltration.cpp b/matching/tests/test_bifiltration.cpp
+index 742dab8..f63e231 100644
+--- a/matching/tests/test_bifiltration.cpp
++++ b/matching/tests/test_bifiltration.cpp
+@@ -1,4 +1,4 @@
+-#include "catch/catch.hpp"
++#include <catch2/catch.hpp>
+ 
+ #include <sstream>
+ #include <iostream>
+diff --git a/matching/tests/test_common.cpp b/matching/tests/test_common.cpp
+index 9079a56..d390585 100644
+--- a/matching/tests/test_common.cpp
++++ b/matching/tests/test_common.cpp
+@@ -1,4 +1,4 @@
+-#include "catch/catch.hpp"
++#include <catch2/catch.hpp>
+ 
+ #include <sstream>
+ #include <iostream>
+diff --git a/matching/tests/test_matching_distance.cpp b/matching/tests/test_matching_distance.cpp
+index 115c8d9..08c59c0 100644
+--- a/matching/tests/test_matching_distance.cpp
++++ b/matching/tests/test_matching_distance.cpp
+@@ -1,4 +1,4 @@
+-#include "catch/catch.hpp"
++#include <catch2/catch.hpp>
+ 
+ #include <sstream>
+ #include <iostream>
+diff --git a/matching/tests/test_module.cpp b/matching/tests/test_module.cpp
+index bae1f78..3dbe5b1 100644
+--- a/matching/tests/test_module.cpp
++++ b/matching/tests/test_module.cpp
+@@ -1,4 +1,4 @@
+-#include "catch/catch.hpp"
++#include <catch2/catch.hpp>
+ 
+ #include <sstream>
+ #include <iostream>
+diff --git a/matching/tests/tests_main.cpp b/matching/tests/tests_main.cpp
+index 1c77b13..4ed06df 100644
+--- a/matching/tests/tests_main.cpp
++++ b/matching/tests/tests_main.cpp
+@@ -1,2 +1,2 @@
+ #define CATCH_CONFIG_MAIN
+-#include "catch/catch.hpp"
++#include <catch2/catch.hpp>
+diff --git a/wasserstein/tests/test_hera_wasserstein.cpp b/wasserstein/tests/test_hera_wasserstein.cpp
+index 0a80d2f..dc935e8 100644
+--- a/wasserstein/tests/test_hera_wasserstein.cpp
++++ b/wasserstein/tests/test_hera_wasserstein.cpp
+@@ -1,5 +1,5 @@
+ #define LOG_AUCTION
+-#include "catch/catch.hpp"
++#include <catch2/catch.hpp>
+ 
+ #include <sstream>
+ #include <iostream>
+diff --git a/wasserstein/tests/test_hera_wasserstein_pure_geom.cpp b/wasserstein/tests/test_hera_wasserstein_pure_geom.cpp
+index 9603ceb..3110c4c 100644
+--- a/wasserstein/tests/test_hera_wasserstein_pure_geom.cpp
++++ b/wasserstein/tests/test_hera_wasserstein_pure_geom.cpp
+@@ -1,4 +1,4 @@
+-#include "catch/catch.hpp"
++#include <catch2/catch.hpp>
+ 
+ #include <sstream>
+ #include <iostream>
+diff --git a/wasserstein/tests/tests_main.cpp b/wasserstein/tests/tests_main.cpp
+index d24407e..1f558c8 100644
+--- a/wasserstein/tests/tests_main.cpp
++++ b/wasserstein/tests/tests_main.cpp
+@@ -1,3 +1,3 @@
+ #define LOG_AUCTION
+ #define CATCH_CONFIG_MAIN
+-#include "catch/catch.hpp"
++#include <catch2/catch.hpp>
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..06ec138
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Use-system-catch2.patch