Move catch.hpp to separate folder

This is to avoid direct inclusion of catch.hpp when use_catch.h should be used
instead. The first guard here is module_dependencies.txt, where only
testing-utils must have "catch" listed. The second line of defense is a macro
that must be set.

Author: tautschnig

unit/catch/CMakeLists.txt

@@ -0,0 +1,4 @@
+target_include_directories(catch
+    PUBLIC
+    ${CMAKE_CURRENT_SOURCE_DIR}/..
+)

unit/testing-utils/catch.hpp renamed to unit/catch/catch.hpp

@@ -8,6 +8,11 @@
  *  Distributed under the Boost Software License, Version 1.0. (See accompanying
  *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  */
+
+#ifndef INCLUDED_VIA_USE_CATCH_H
+#error Do not include this file directly, use use_catch.h instead
+#endif
+
 #ifndef TWOBLUECUBES_SINGLE_INCLUDE_CATCH_HPP_INCLUDED
 #define TWOBLUECUBES_SINGLE_INCLUDE_CATCH_HPP_INCLUDED
 

unit/testing-utils/module_dependencies.txt

@@ -1,4 +1,5 @@
 ansi-c
+catch
 testing-utils
 util
 analyses

unit/testing-utils/use_catch.h

@@ -28,7 +28,9 @@ Author: Michael Tautschnig
 // signed/unsigned mismatch
 #endif
 
-#include "catch.hpp"
+#define INCLUDED_VIA_USE_CATCH_H
+
+#include <catch/catch.hpp>
 
 #ifdef _MSC_VER
 #include <util/pragma_pop.def>