From 428210ee5f26d3f08b02978263a44936460fb98d Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sun, 19 Jun 2022 22:52:37 +0200 Subject: [PATCH] - change cmake configure handling --- make/environment-build.mk | 28 ++++++++++++++++++++-------- package/pkg-cmake.mk | 4 ++-- 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/make/environment-build.mk b/make/environment-build.mk index 74126b59..b372629d 100644 --- a/make/environment-build.mk +++ b/make/environment-build.mk @@ -356,15 +356,27 @@ TARGET_CMAKE_OPTS += \ TARGET_CMAKE_OPTS += \ $($(PKG)_CONF_OPTS) -HOST_CMAKE = \ - rm -f CMakeCache.txt; \ - $(HOST_CMAKE_ENV) cmake $(HOST_CMAKE_OPTS) - -TARGET_CMAKE = \ - rm -f CMakeCache.txt; \ - $(TARGET_CMAKE_ENV) cmake $(TARGET_CMAKE_OPTS) +define HOST_CMAKE + @$(call MESSAGE,"Configuring") + $(foreach hook,$($(PKG)_PRE_CONFIGURE_HOOKS),$(call $(hook))$(sep)) + $(Q)( \ + $(CHDIR)/$($(PKG)_DIR); \ + rm -f CMakeCache.txt; \ + $(HOST_CMAKE_ENV) cmake $(HOST_CMAKE_OPTS); \ + ) + $(foreach hook,$($(PKG)_POST_CONFIGURE_HOOKS),$(call $(hook))$(sep)) +endef -CMAKE = $(TARGET_CMAKE) +define TARGET_CMAKE + @$(call MESSAGE,"Configuring") + $(foreach hook,$($(PKG)_PRE_CONFIGURE_HOOKS),$(call $(hook))$(sep)) + $(Q)( \ + $(CHDIR)/$($(PKG)_DIR); \ + rm -f CMakeCache.txt; \ + $(TARGET_CMAKE_ENV) cmake $(TARGET_CMAKE_OPTS); \ + ) + $(foreach hook,$($(PKG)_POST_CONFIGURE_HOOKS),$(call $(hook))$(sep)) +endef # ----------------------------------------------------------------------------- diff --git a/package/pkg-cmake.mk b/package/pkg-cmake.mk index 2da74236..3e2e8011 100644 --- a/package/pkg-cmake.mk +++ b/package/pkg-cmake.mk @@ -6,8 +6,8 @@ define cmake-package $(call PREPARE) + $(call TARGET_CMAKE) $(CHDIR)/$($(PKG)_DIR); \ - $(TARGET_CMAKE); \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) $(TARGET_RM) $(TARGET_libdir)/cmake @@ -16,8 +16,8 @@ endef define host-cmake-package $(call PREPARE) + $(call HOST_CMAKE) $(CHDIR)/$($(PKG)_DIR); \ - $(HOST_CMAKE); \ $(MAKE); \ $(MAKE) install $(call HOST_FOLLOWUP)