X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=tools%2Fcmake%2FMakefile;h=a209fe3a814702e840bf83314fe258664efe1e11;hb=791a3a22ad86def9a7a71168a596a0a920fe3eeb;hp=489c27f1d825ab47a97a6a89fed1fcfa42e0dab5;hpb=2c05fd7ef429cd4f10f44adf604bbc814b189c6b;p=openwrt%2Fstaging%2Fstintel.git

diff --git a/tools/cmake/Makefile b/tools/cmake/Makefile
index 489c27f1d8..a209fe3a81 100644
--- a/tools/cmake/Makefile
+++ b/tools/cmake/Makefile
@@ -7,23 +7,29 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=cmake
-PKG_VERSION:=3.7.0
+PKG_VERSION:=3.12.2
+PKG_CPE_ID:=cpe:/a:kitware:cmake
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://cmake.org/files/v3.7/ \
+PKG_SOURCE_URL:=https://cmake.org/files/v3.12/ \
 		https://fossies.org/linux/misc/
-PKG_MD5SUM:=3801dc4e54c1c957a7378d8b0d4254ba
+PKG_HASH:=0f97485799e51a7070cc11494f3e02349b0fc3a24cc12b082e737bf67a0581a4
 
 HOST_BUILD_PARALLEL:=1
 HOST_CONFIGURE_PARALLEL:=1
 
 include $(INCLUDE_DIR)/host-build.mk
 
-HOST_CONFIGURE_CMD := MAKEFLAGS="$(HOST_JOBS)" $(BASH) ./configure
-
-HOST_CONFIGURE_VARS :=
+HOST_CONFIGURE_VARS += \
+	MAKEFLAGS="$(HOST_JOBS)" \
+	CXXFLAGS="$(HOST_CFLAGS)"
 
 HOST_CONFIGURE_ARGS := \
+	$(if $(MAKE_JOBSERVER),--parallel="$(MAKE_JOBSERVER)") \
 	--prefix=$(STAGING_DIR_HOST)
 
+ifneq ($(findstring c,$(OPENWRT_VERBOSE)),)
+  HOST_MAKE_FLAGS += VERBOSE=1
+endif
+
 $(eval $(call HostBuild))