Skip to content

Commit a850886

Browse files
committed
Update yaml-cpp.patch
1 parent 871c323 commit a850886

File tree

3 files changed

+21
-5
lines changed

3 files changed

+21
-5
lines changed

external/json-schema-validator.patch

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
diff --git a/CMakeLists.txt b/CMakeLists.txt
2-
index e6aff61..fa90bc0 100644
2+
index e6aff61..8826dae 100644
33
--- a/CMakeLists.txt
44
+++ b/CMakeLists.txt
5+
@@ -1,4 +1,4 @@
6+
-cmake_minimum_required(VERSION 3.2)
7+
+cmake_minimum_required(VERSION 3.5)
8+
9+
option(JSON_VALIDATOR_BUILD_TESTS "Build tests" ON)
10+
option(JSON_VALIDATOR_BUILD_EXAMPLES "Build examples" ON)
511
@@ -132,9 +132,9 @@ set(INSTALL_CMAKE_DIR "lib/cmake/${PROJECT_NAME}")
612
set(INSTALL_CMAKEDIR_ROOT share/cmake)
713

@@ -16,7 +22,7 @@ index e6aff61..fa90bc0 100644
1622
include(CMakePackageConfigHelpers)
1723
write_basic_package_version_file(
1824
diff --git a/src/json-validator.cpp b/src/json-validator.cpp
19-
index 0beb613..0a9122b 100644
25+
index 0beb613..4f3213f 100644
2026
--- a/src/json-validator.cpp
2127
+++ b/src/json-validator.cpp
2228
@@ -218,12 +218,16 @@ public:

external/json.patch

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
1+
diff --git a/CMakeLists.txt b/CMakeLists.txt
2+
index b93c6e47..11448a52 100644
3+
--- a/CMakeLists.txt
4+
+++ b/CMakeLists.txt
5+
@@ -1,4 +1,4 @@
6+
-cmake_minimum_required(VERSION 3.1)
7+
+cmake_minimum_required(VERSION 3.10)
8+
9+
##
10+
## PROJECT
111
diff --git a/include/nlohmann/detail/exceptions.hpp b/include/nlohmann/detail/exceptions.hpp
2-
index b4b180496..597f835d8 100644
12+
index b4b18049..597f835d 100644
313
--- a/include/nlohmann/detail/exceptions.hpp
414
+++ b/include/nlohmann/detail/exceptions.hpp
515
@@ -127,9 +127,8 @@ class parse_error : public exception
@@ -41,7 +51,7 @@ index b4b180496..597f835d8 100644
4151

4252
/// @brief exception indicating errors with iterators
4353
diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp
44-
index 92308c557..479aad4a5 100644
54+
index 92308c55..479aad4a 100644
4555
--- a/single_include/nlohmann/json.hpp
4656
+++ b/single_include/nlohmann/json.hpp
4757
@@ -2912,9 +2912,8 @@ class parse_error : public exception

external/yaml-cpp.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ index 46dc180..b746ac1 100644
55
@@ -1,5 +1,5 @@
66
# 3.5 is actually available almost everywhere, but this a good minimum
77
-cmake_minimum_required(VERSION 3.4)
8-
+cmake_minimum_required(VERSION 3.4...3.14)
8+
+cmake_minimum_required(VERSION 3.10)
99

1010
# enable MSVC_RUNTIME_LIBRARY target property
1111
# see https://cmake.org/cmake/help/latest/policy/CMP0091.html

0 commit comments

Comments
 (0)