From 3c4df661c0c8d693b5198cbbf61f679c76fdea52 Mon Sep 17 00:00:00 2001 From: Hannu Nyman Date: Fri, 5 Jan 2018 23:30:02 +0200 Subject: tools/cmake: update to 3.10.1 Update cmake to 3.10.1 Refresh patches Signed-off-by: Hannu Nyman --- tools/cmake/patches/110-alpine_musl-compat.patch | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'tools/cmake/patches/110-alpine_musl-compat.patch') diff --git a/tools/cmake/patches/110-alpine_musl-compat.patch b/tools/cmake/patches/110-alpine_musl-compat.patch index ae93201..a2c84fc 100644 --- a/tools/cmake/patches/110-alpine_musl-compat.patch +++ b/tools/cmake/patches/110-alpine_musl-compat.patch @@ -1,6 +1,6 @@ --- a/Utilities/cmjsoncpp/include/json/assertions.h +++ b/Utilities/cmjsoncpp/include/json/assertions.h -@@ -6,12 +6,12 @@ +@@ -6,11 +6,12 @@ #ifndef CPPTL_JSON_ASSERTIONS_H_INCLUDED #define CPPTL_JSON_ASSERTIONS_H_INCLUDED @@ -11,7 +11,6 @@ #endif // if !defined(JSON_IS_AMALGAMATION) -#include -- - #if JSON_USE_EXCEPTION - #include - #define JSON_ASSERT(condition) \ + #include + + /** It should not be possible for a maliciously designed file to -- cgit v1.1