summaryrefslogtreecommitdiff
path: root/dev-cpp/mustache/files/mustache-4.1_p20211210-unbundle-catch.patch
blob: bb68eb4c127c0bad48f826d7b7fff715132d2637 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
Unbundle test dependency dev-cpp/catch and make test compilation optional.

Author: Lucio Sauer <watermanpaint@posteo.net>
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,12 @@ cmake_minimum_required(VERSION 3.0.2)
 project(mustache)
 add_library(mustache INTERFACE)
 
+option(TESTS "build tests")
+
 target_compile_features(mustache INTERFACE cxx_std_17)
 target_sources(mustache INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/mustache.hpp)
 target_include_directories(mustache INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
-add_subdirectory(tests)
\ No newline at end of file
+
+if (TESTS)
+	add_subdirectory(tests)
+endif (TESTS)
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,10 +1,12 @@
+find_package(Catch2 REQUIRED)
+
 add_executable(mustache-unit-tests
     ../mustache.hpp # to show in IDE
-    catch.hpp # to show in IDE
     tests.cpp
 )
 
-target_link_libraries(mustache-unit-tests PRIVATE mustache)
+
+target_link_libraries(mustache-unit-tests PRIVATE mustache Catch2::Catch2)
 
 if (UNIX)
     target_compile_options(mustache-unit-tests PRIVATE -Wall -Wextra -Werror -Wconversion)
--- a/tests/tests.cpp
+++ b/tests/tests.cpp
@@ -29,7 +29,7 @@
 #include "mustache.hpp"
 
 #define CATCH_CONFIG_MAIN
-#include "catch.hpp"
+#include <catch2/catch.hpp>
 
 using namespace kainjow::mustache;