- change cmake configure handling

make/environment-build.mk

@@ -356,15 +356,27 @@ TARGET_CMAKE_OPTS += \
 TARGET_CMAKE_OPTS += \
 	$($(PKG)_CONF_OPTS)
 
-HOST_CMAKE = \
+define HOST_CMAKE
-	rm -f CMakeCache.txt; \
+	@$(call MESSAGE,"Configuring")
-	$(HOST_CMAKE_ENV) cmake $(HOST_CMAKE_OPTS)
+	$(foreach hook,$($(PKG)_PRE_CONFIGURE_HOOKS),$(call $(hook))$(sep))
-
+	$(Q)( \
-TARGET_CMAKE = \
+	$(CHDIR)/$($(PKG)_DIR); \
-	rm -f CMakeCache.txt; \
+		rm -f CMakeCache.txt; \
-	$(TARGET_CMAKE_ENV) cmake $(TARGET_CMAKE_OPTS)
+		$(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
 
 # -----------------------------------------------------------------------------
 

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)