diff options
author | Hauke Mehrtens <hauke@openwrt.org> | 2016-04-17 12:52:37 +0000 |
---|---|---|
committer | Hauke Mehrtens <hauke@openwrt.org> | 2016-04-17 12:52:37 +0000 |
commit | 08c21d61e7fdfff7330626098eb84b5f06d7fd2c (patch) | |
tree | cc737804efd7a4b02fb5666f82ba145d0e68d607 /tools/cmake/patches | |
parent | 050b864e95b8a9cc7ef283e2eb0e1b460f488758 (diff) | |
download | master-187ad058-08c21d61e7fdfff7330626098eb84b5f06d7fd2c.tar.gz master-187ad058-08c21d61e7fdfff7330626098eb84b5f06d7fd2c.tar.bz2 master-187ad058-08c21d61e7fdfff7330626098eb84b5f06d7fd2c.zip |
tools/cmake: update to 3.5.1
Update cmake to 3.5.1
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@49186 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'tools/cmake/patches')
-rw-r--r-- | tools/cmake/patches/100-disable_qt_tests.patch | 4 | ||||
-rw-r--r-- | tools/cmake/patches/110-freebsd-compat.patch | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/tools/cmake/patches/100-disable_qt_tests.patch b/tools/cmake/patches/100-disable_qt_tests.patch index 417e27afab..9d2f641041 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 -@@ -216,15 +216,6 @@ +@@ -217,15 +217,6 @@ add_RunCMake_test(interface_library) 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 -@@ -390,10 +390,6 @@ +@@ -389,10 +389,6 @@ if(BUILD_TESTING) 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 b54944829b..49c9b7809d 100644 --- a/tools/cmake/patches/110-freebsd-compat.patch +++ b/tools/cmake/patches/110-freebsd-compat.patch @@ -19,8 +19,6 @@ Change-Id: I3b91ed7ac0e6878035aee202b3336c536cc6d2ff Source/kwsys/SystemInformation.cxx | 9 +++++++++ 1 file changed, 9 insertions(+) -diff --git a/Source/kwsys/SystemInformation.cxx b/Source/kwsys/SystemInformation.cxx -index 7c31f3a..2672730 100644 --- a/Source/kwsys/SystemInformation.cxx +++ b/Source/kwsys/SystemInformation.cxx @@ -90,6 +90,15 @@ typedef int siginfo_t; @@ -39,4 +37,3 @@ index 7c31f3a..2672730 100644 #endif #if defined(__OpenBSD__) || defined(__NetBSD__) - |