From b0c0e0ef0966436c0fb302f2843e00e3fea7eadd Mon Sep 17 00:00:00 2001
From: tastytea <tastytea@tastytea.de>
Date: Tue, 1 Jan 2019 17:35:14 +0100
Subject: [PATCH] Added compatibility for Catch < 2, hopefully.

---
 .drone.yml                        |  4 +++-
 src/tests/main.cpp                |  2 +-
 src/tests/test_ltr_asymmetric.cpp |  2 +-
 src/tests/test_ltr_symmetric.cpp  |  2 +-
 src/tests/test_sigil.cpp          |  2 +-
 tests.CMakeLists.txt              | 10 ++++++++--
 6 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index ea4f843..f82a4ac 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -43,7 +43,9 @@ pipeline:
       - rm -rf build && mkdir -p build && cd build
       - cmake -DCMAKE_INSTALL_PREFIX=/usr -DWITH_TESTS=1 ..
       - make VERBOSE=1
-      - ctest ..
+      - ./test_ltr_symmetric
+      - ./test_ltr_asymmetric
+      - ./test_sigil
       - make install DESTDIR=install
       - make package
       - cmake -DWITH_DEB=ON ..
diff --git a/src/tests/main.cpp b/src/tests/main.cpp
index 4ed06df..b3143fb 100644
--- a/src/tests/main.cpp
+++ b/src/tests/main.cpp
@@ -1,2 +1,2 @@
 #define CATCH_CONFIG_MAIN
-#include <catch2/catch.hpp>
+#include <catch.hpp>
diff --git a/src/tests/test_ltr_asymmetric.cpp b/src/tests/test_ltr_asymmetric.cpp
index e72c5d4..8f9eb1f 100644
--- a/src/tests/test_ltr_asymmetric.cpp
+++ b/src/tests/test_ltr_asymmetric.cpp
@@ -1,4 +1,4 @@
-#include <catch2/catch.hpp>
+#include <catch.hpp>
 #include <string>
 #include <Magick++/Image.h>
 #include "identiconpp.hpp"
diff --git a/src/tests/test_ltr_symmetric.cpp b/src/tests/test_ltr_symmetric.cpp
index 58dff59..0580e12 100644
--- a/src/tests/test_ltr_symmetric.cpp
+++ b/src/tests/test_ltr_symmetric.cpp
@@ -1,4 +1,4 @@
-#include <catch2/catch.hpp>
+#include <catch.hpp>
 #include <string>
 #include <Magick++/Image.h>
 #include "identiconpp.hpp"
diff --git a/src/tests/test_sigil.cpp b/src/tests/test_sigil.cpp
index 0f987c1..1d710fe 100644
--- a/src/tests/test_sigil.cpp
+++ b/src/tests/test_sigil.cpp
@@ -1,4 +1,4 @@
-#include <catch2/catch.hpp>
+#include <catch.hpp>
 #include <string>
 #include <Magick++/Image.h>
 #include "identiconpp.hpp"
diff --git a/tests.CMakeLists.txt b/tests.CMakeLists.txt
index 5eda443..09ef4c5 100644
--- a/tests.CMakeLists.txt
+++ b/tests.CMakeLists.txt
@@ -1,12 +1,18 @@
 if(WITH_TESTS)
-    find_package(Catch2 REQUIRED)
+    find_package(Catch2)
+    if(Catch2_FOUND)
+        set(MYCATCH, Catch2::Catch2)
+    else()
+        set(MYCATCH, "")
+    endif()
     include(CTest)
 
     file(GLOB sources_tests src/tests/test_*.cpp)
     foreach(src ${sources_tests})
         get_filename_component(bin ${src} NAME_WE)
         add_executable(${bin} src/tests/main.cpp ${src})
-        target_link_libraries(${bin} ${CMAKE_PROJECT_NAME} Catch2::Catch2)
+        target_link_libraries(${bin} ${CMAKE_PROJECT_NAME} ${MYCATCH})
+        target_include_directories(${bin} PRIVATE "/usr/include/catch2")
         add_test(${bin} ${bin})
     endforeach()
 endif()