From 9ffd80fef5db275efe56703ba98dcbbb4f390164 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Sat, 21 Nov 2015 21:26:02 +0000 Subject: tools/cmake: update to 3.4.0 Update cmake to 3.4.0. Refresh patches. Signed-off-by: Hannu Nyman SVN-Revision: 47568 --- tools/cmake/patches/100-disable_qt_tests.patch | 4 ++-- tools/cmake/patches/110-freebsd-compat.patch | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'tools/cmake/patches') diff --git a/tools/cmake/patches/100-disable_qt_tests.patch b/tools/cmake/patches/100-disable_qt_tests.patch index deaa5ae48c..417e27afab 100644 --- a/tools/cmake/patches/100-disable_qt_tests.patch +++ b/tools/cmake/patches/100-disable_qt_tests.patch @@ -1,6 +1,6 @@ --- a/Tests/RunCMake/CMakeLists.txt +++ b/Tests/RunCMake/CMakeLists.txt -@@ -160,15 +160,6 @@ +@@ -216,15 +216,6 @@ add_RunCMake_test(no_install_prefix) add_RunCMake_test(configure_file) @@ -18,7 +18,7 @@ add_RunCMake_test(FindPkgConfig) --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt -@@ -358,10 +358,6 @@ +@@ -390,10 +390,6 @@ list(APPEND TEST_BUILD_DIRS ${CMake_TEST_INSTALL_PREFIX}) diff --git a/tools/cmake/patches/110-freebsd-compat.patch b/tools/cmake/patches/110-freebsd-compat.patch index 9133db5038..b54944829b 100644 --- a/tools/cmake/patches/110-freebsd-compat.patch +++ b/tools/cmake/patches/110-freebsd-compat.patch @@ -23,7 +23,7 @@ diff --git a/Source/kwsys/SystemInformation.cxx b/Source/kwsys/SystemInformation index 7c31f3a..2672730 100644 --- a/Source/kwsys/SystemInformation.cxx +++ b/Source/kwsys/SystemInformation.cxx -@@ -91,6 +91,15 @@ typedef int siginfo_t; +@@ -90,6 +90,15 @@ typedef int siginfo_t; # include # define KWSYS_SYSTEMINFORMATION_IMPLEMENT_FQDN # endif -- cgit v1.2.3