RepoMirrors/openwrt
1
0
Fork 0
mirror of git://git.openwrt.org/openwrt/openwrt.git synced 2024-12-27 00:52:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

tools/cmake: update to 3.5.1

Browse Source 
Update cmake to 3.5.1

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

SVN-Revision: 49186
This commit is contained in:
Hauke Mehrtens 2016-04-17 12:52:37 +00:00
parent 70e30d322b
commit 5a5657cda1
3 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/cmake/Makefile
View File

@ -7,12 +7,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=cmake PKG_NAME:=cmake
PKG_VERSION:=3.4.3 PKG_VERSION:=3.5.1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://cmake.org/files/v3.4/ \ PKG_SOURCE_URL:=https://cmake.org/files/v3.5/ \
https://fossies.org/linux/misc/ https://fossies.org/linux/misc/
PKG_MD5SUM:=4cb3ff35b2472aae70f542116d616e63 PKG_MD5SUM:=ca051f4a66375c89d1a524e726da0296
HOST_BUILD_PARALLEL:=1 HOST_BUILD_PARALLEL:=1
HOST_CONFIGURE_PARALLEL:=1 HOST_CONFIGURE_PARALLEL:=1

4
tools/cmake/patches/100-disable_qt_tests.patch
View File

@ -1,6 +1,6 @@
--- a/Tests/RunCMake/CMakeLists.txt --- a/Tests/RunCMake/CMakeLists.txt
+++ b/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(no_install_prefix)
add_RunCMake_test(configure_file) add_RunCMake_test(configure_file)
@ -18,7 +18,7 @@
add_RunCMake_test(FindPkgConfig) add_RunCMake_test(FindPkgConfig)
--- a/Tests/CMakeLists.txt --- a/Tests/CMakeLists.txt
+++ b/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}) list(APPEND TEST_BUILD_DIRS ${CMake_TEST_INSTALL_PREFIX})

3
tools/cmake/patches/110-freebsd-compat.patch
View File

@ -19,8 +19,6 @@ Change-Id: I3b91ed7ac0e6878035aee202b3336c536cc6d2ff
Source/kwsys/SystemInformation.cxx | 9 +++++++++ Source/kwsys/SystemInformation.cxx | 9 +++++++++
1 file changed, 9 insertions(+) 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 --- a/Source/kwsys/SystemInformation.cxx
+++ b/Source/kwsys/SystemInformation.cxx +++ b/Source/kwsys/SystemInformation.cxx
@@ -90,6 +90,15 @@ typedef int siginfo_t; @@ -90,6 +90,15 @@ typedef int siginfo_t;
@ -39,4 +37,3 @@ index 7c31f3a..2672730 100644
#endif #endif
#if defined(__OpenBSD__) || defined(__NetBSD__) #if defined(__OpenBSD__) || defined(__NetBSD__)