From 7be5f6bd358fd8b4edcbc58928fb99a36115545b Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Sun, 13 Oct 2019 18:37:46 +1100 Subject: [PATCH] cmake: update 3.10.0 --> 3.15.4 replaces #2293 --- src/cmake-conf.mk | 2 +- src/cmake.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/cmake-conf.mk b/src/cmake-conf.mk index 3f588af9..4e12f227 100644 --- a/src/cmake-conf.mk +++ b/src/cmake-conf.mk @@ -5,7 +5,7 @@ $(PKG)_VERSION := 1 $(PKG)_UPDATE := echo 1 $(PKG)_TARGETS := $(BUILD) $(MXE_TARGETS) $(PKG)_DEPS := $(BUILD)~$(PKG) -$(PKG)_FILE_DEPS := $(wildcard $(PWD)/src/cmake/conf/*) +$(PKG)_FILE_DEPS := $(wildcard $(PWD)/src/cmake/*/*) $(PKG)_DEPS_$(BUILD) := cmake # ensure conf is also built for a minimal `make cc cmake` diff --git a/src/cmake.mk b/src/cmake.mk index c58b8235..7384485c 100644 --- a/src/cmake.mk +++ b/src/cmake.mk @@ -3,8 +3,8 @@ PKG := cmake $(PKG)_WEBSITE := https://www.cmake.org/ $(PKG)_IGNORE := -$(PKG)_VERSION := 3.10.0 -$(PKG)_CHECKSUM := b3345c17609ea0f039960ef470aa099de9942135990930a57c14575aae884987 +$(PKG)_VERSION := 3.15.4 +$(PKG)_CHECKSUM := 8a211589ea21374e49b25fc1fc170e2d5c7462b795f1b29c84dd0e984301ed7a $(PKG)_SUBDIR := cmake-$($(PKG)_VERSION) $(PKG)_FILE := cmake-$($(PKG)_VERSION).tar.gz $(PKG)_URL := https://www.cmake.org/files/v$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE)