diff --git a/tools/cmake/Makefile b/tools/cmake/Makefile index 476eb2cc88f..b70507baed8 100644 --- a/tools/cmake/Makefile +++ b/tools/cmake/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=cmake PKG_VERSION:=4.4.3 PKG_VERSION_MAJOR:=$(word 1,$(subst ., ,$(PKG_VERSION))).$(word 2,$(subst ., ,$(PKG_VERSION))) -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_CPE_ID:=cpe:/a:kitware:cmake PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz @@ -39,6 +39,14 @@ HOST_CONFIGURE_ARGS := \ --system-zstd \ --generator=Ninja +CMAKE_HOST_OPTIONS = \ + -DZSTD_INCLUDE_DIR="$(STAGING_DIR_HOST)/include" \ + -DZSTD_LIBRARY="$(STAGING_DIR_HOST)/lib/libzstd.a" + +define Host/Configure + $(call Host/Configure/Default,-- $(CMAKE_HOST_OPTIONS)) +endef + define Host/Compile/Default +$(NINJA) -C $(HOST_BUILD_DIR) $(1) endef diff --git a/tools/cmake/patches/150-zstd-libarchive.patch b/tools/cmake/patches/150-zstd-libarchive.patch deleted file mode 100644 index 6ea9ed7cec6..00000000000 --- a/tools/cmake/patches/150-zstd-libarchive.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/Utilities/cmlibarchive/CMakeLists.txt -+++ b/Utilities/cmlibarchive/CMakeLists.txt -@@ -682,7 +682,7 @@ IF(ENABLE_ZSTD) - SET(ZSTD_FIND_QUIETLY TRUE) - ENDIF (ZSTD_INCLUDE_DIR) - -- IF(0) # CMake does not let pkg-config override its search paths. -+ IF(1) # CMake does not let pkg-config override its search paths. - IF(UNIX) - FIND_PACKAGE(PkgConfig QUIET) - PKG_SEARCH_MODULE(PC_ZSTD libzstd)