Skip to content

Commit

Permalink
tools/cmake: update to 3.7.0
Browse files Browse the repository at this point in the history
Release notes at
https://cmake.org/cmake/help/v3.7/release/3.7.html

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
hnyman authored and blogic committed Nov 26, 2016
1 parent a22464b commit 2c05fd7
Showing 3 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions tools/cmake/Makefile
Original file line number Diff line number Diff line change
@@ -7,12 +7,12 @@
include $(TOPDIR)/rules.mk

PKG_NAME:=cmake
PKG_VERSION:=3.6.1
PKG_VERSION:=3.7.0

PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://cmake.org/files/v3.6/ \
PKG_SOURCE_URL:=https://cmake.org/files/v3.7/ \
https://fossies.org/linux/misc/
PKG_MD5SUM:=d6dd661380adacdb12f41b926ec99545
PKG_MD5SUM:=3801dc4e54c1c957a7378d8b0d4254ba

HOST_BUILD_PARALLEL:=1
HOST_CONFIGURE_PARALLEL:=1
4 changes: 2 additions & 2 deletions tools/cmake/patches/100-disable_qt_tests.patch
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -219,15 +219,6 @@ add_RunCMake_test(no_install_prefix)
@@ -225,15 +225,6 @@ add_RunCMake_test(no_install_prefix)
add_RunCMake_test(configure_file)
add_RunCMake_test(CTestTimeoutAfterMatch)

@@ -18,7 +18,7 @@
add_RunCMake_test(FindPkgConfig)
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -392,10 +392,6 @@ if(BUILD_TESTING)
@@ -393,10 +393,6 @@ if(BUILD_TESTING)

list(APPEND TEST_BUILD_DIRS ${CMake_TEST_INSTALL_PREFIX})

2 changes: 1 addition & 1 deletion tools/cmake/patches/110-freebsd-compat.patch
Original file line number Diff line number Diff line change
@@ -36,4 +36,4 @@ Change-Id: I3b91ed7ac0e6878035aee202b3336c536cc6d2ff
+# endif
#endif

#if defined(__OpenBSD__) || defined(__NetBSD__)
#if defined(KWSYS_SYS_HAS_MACHINE_CPU_H)

0 comments on commit 2c05fd7

Please sign in to comment.