tools/cmake: Update to 3.12.1

Update cmake to 3.12.1

Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net>
(backported from 0578993a41fed9855a5e8ff3ce7dca7530c69fd7)

diff --git a/tools/cmake/Makefile b/tools/cmake/Makefile
index 839789d1781b11d50da4b1e0a1b3acd9dc785ae7..340c47cb078e026e53f098a0219b29c1e8df28f5 100644 (file)
--- a/tools/cmake/Makefile
+++ b/tools/cmake/Makefile
@@ -7,13 +7,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=cmake
-PKG_VERSION:=3.12.0
+PKG_VERSION:=3.12.1
 PKG_CPE_ID:=cpe:/a:kitware:cmake
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://cmake.org/files/v3.12/ \
                https://fossies.org/linux/misc/
-PKG_HASH:=d0781a90f6cdb9049d104ac16a150f9350b693498b9dea8a0331e799db6b9d69
+PKG_HASH:=c53d5c2ce81d7a957ee83e3e635c8cda5dfe20c9d501a4828ee28e1615e57ab2
 
 HOST_BUILD_PARALLEL:=1
 HOST_CONFIGURE_PARALLEL:=1

diff --git a/tools/cmake/patches/100-disable_qt_tests.patch b/tools/cmake/patches/100-disable_qt_tests.patch
index 262360d2876398f6a86f91419506de2aa57d711b..a354e1cac1d0ccf3111e1df634e090febd3bd1f6 100644 (file)
--- 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
-@@ -289,15 +289,6 @@ add_RunCMake_test(no_install_prefix)
+@@ -290,15 +290,6 @@ add_RunCMake_test(no_install_prefix)
  add_RunCMake_test(configure_file)
  add_RunCMake_test(CTestTimeoutAfterMatch)