From 96e7bca18bd55a70c7f837949c791af52ba91e7e Mon Sep 17 00:00:00 2001 From: Fabio Porcedda Date: Wed, 11 Feb 2015 18:52:21 +0100 Subject: [PATCH] pkg-cmake: reduce output when being silent Use CMAKE_RULE_MESSAGES and CMAKE_INSTALL_MESSAGE variables to reduce cmake output when it is a silent build. [Thomas: - use ifneq instead of ifdef - remove unneeded else clause - also add to the host variant of the configure commands] Signed-off-by: Fabio Porcedda Signed-off-by: Thomas Petazzoni --- package/pkg-cmake.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/pkg-cmake.mk b/package/pkg-cmake.mk index 6c9955d243..958639ffe8 100644 --- a/package/pkg-cmake.mk +++ b/package/pkg-cmake.mk @@ -31,6 +31,10 @@ CMAKE_HOST_C_COMPILER = $(HOSTCC) CMAKE_HOST_CXX_COMPILER = $(HOSTCXX) endif +ifneq ($(QUIET),) +CMAKE_QUIET = -DCMAKE_RULE_MESSAGES=OFF -DCMAKE_INSTALL_MESSAGE=NEVER +endif + ################################################################################ # inner-cmake-package -- defines how the configuration, compilation and # installation of a CMake package should be done, implements a few hooks to @@ -86,6 +90,7 @@ define $(2)_CONFIGURE_CMDS -DBUILD_TESTING=OFF \ -DBUILD_SHARED_LIBS=$$(if $$(BR2_STATIC_LIBS),OFF,ON) \ -DUSE_CCACHE=$$(if $$(BR2_CCACHE),ON,OFF) \ + $$(CMAKE_QUIET) \ $$($$(PKG)_CONF_OPTS) \ ) endef @@ -121,6 +126,7 @@ define $(2)_CONFIGURE_CMDS -DBUILD_TEST=OFF \ -DBUILD_TESTS=OFF \ -DBUILD_TESTING=OFF \ + $$(CMAKE_QUIET) \ $$($$(PKG)_CONF_OPTS) \ ) endef