X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=tools%2Fcmake%2FMakefile;h=19c4a5b8b80e0860e30eafe65502266078763657;hb=518923178cfeba6a05ca6fb610f9c6d6e808fd75;hp=efcca4391b9cbe7d4b5f864ca1b8f48a53477b25;hpb=11c7e45e8d3fd0552dc108e8dc20f7cce5fb3a96;p=openwrt%2Fstaging%2Fnbd.git

diff --git a/tools/cmake/Makefile b/tools/cmake/Makefile
index efcca4391b..19c4a5b8b8 100644
--- a/tools/cmake/Makefile
+++ b/tools/cmake/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2013 OpenWrt.org
+# Copyright (C) 2006-2016 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -7,21 +7,52 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=cmake
-PKG_VERSION:=2.8.12
+PKG_VERSION:=3.27.7
+PKG_VERSION_MAJOR:=$(word 1,$(subst ., ,$(PKG_VERSION))).$(word 2,$(subst ., ,$(PKG_VERSION)))
+PKG_RELEASE:=1
+PKG_CPE_ID:=cpe:/a:kitware:cmake
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://www.cmake.org/files/v2.8/
-PKG_MD5SUM:=105bc6d21cc2e9b6aff901e43c53afea
+PKG_SOURCE_URL:=https://github.com/Kitware/CMake/releases/download/v$(PKG_VERSION)/ \
+		https://cmake.org/files/v$(PKG_VERSION_MAJOR)/
+PKG_HASH:=08f71a106036bf051f692760ef9558c0577c42ac39e96ba097e7662bd4158d8e
 
 HOST_BUILD_PARALLEL:=1
 HOST_CONFIGURE_PARALLEL:=1
 
 include $(INCLUDE_DIR)/host-build.mk
 
-HOST_CONFIGURE_VARS :=
+HOST_CONFIGURE_VARS += \
+	CC="$(HOSTCC_NOCACHE)" \
+	CXX="$(HOSTCXX_NOCACHE)" \
+	MAKEFLAGS="$(HOST_JOBS)" \
+	CXXFLAGS="$(HOST_CFLAGS)" \
+	MAKE="$(STAGING_DIR_HOST)/bin/ninja"
 
 HOST_CONFIGURE_ARGS := \
-	--prefix=$(STAGING_DIR_HOST) \
-	$(if $(MAKE_JOBSERVER),--parallel="$(MAKE_JOBSERVER)")
+	--no-debugger \
+	$(if $(MAKE_JOBSERVER),--parallel="$(MAKE_JOBSERVER)") \
+	--prefix="$(STAGING_DIR_HOST)" \
+	--system-expat \
+	--system-liblzma \
+	--system-zlib \
+	--system-zstd \
+	--generator=Ninja
+
+define Host/Compile/Default
+	+$(NINJA) -C $(HOST_BUILD_DIR) $(1)
+endef
+
+define Host/Install/Default
+	+$(NINJA) -C $(HOST_BUILD_DIR) install
+endef
+
+define Host/Uninstall/Default
+	+$(NINJA) -C $(HOST_BUILD_DIR) uninstall
+endef
+
+ifneq ($(findstring c,$(OPENWRT_VERBOSE)),)
+  HOST_MAKE_FLAGS += VERBOSE=1
+endif
 
 $(eval $(call HostBuild))