From 643e5d94ee0e3def43e7c0f984b51801f8336cc6 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 20 Sep 2016 13:40:49 +0200 Subject: cmake: verbose builds by default --- mk/package.mk | 5 +++++ mk/pkg-bottom.mk | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/mk/package.mk b/mk/package.mk index 26c80e68a..768b845ed 100644 --- a/mk/package.mk +++ b/mk/package.mk @@ -45,6 +45,11 @@ MAKE_ENV+= PATH='${TARGET_PATH}' \ WRKDIR='${WRKDIR}' WRKDIST='${WRKDIST}' \ WRKSRC='${WRKSRC}' WRKBUILD='${WRKBUILD}' +# verbose builds for cmake style +ifeq ($(filter cmake,${CONFIG_STYLE}),) +MAKE_ENV+= VERBOSE=1 +endif + MAKE_FLAGS+= ${XAKE_FLAGS} FAKE_FLAGS+= ${XAKE_FLAGS} diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk index 3f51fc7be..7602b4674 100644 --- a/mk/pkg-bottom.mk +++ b/mk/pkg-bottom.mk @@ -57,7 +57,7 @@ else ifneq ($(filter cmake,${CONFIG_STYLE}),) -e "s#@@STAGING_HOST_DIR@@#$(STAGING_HOST_DIR)#g" \ $(SCRIPT_DIR)/toolchain.cmake.in > $(SCRIPT_DIR)/toolchain.cmake (cd ${WRKBUILD} && PATH='${HOST_PATH}' \ - cmake VERBOSE=1 -Wno-dev -DCMAKE_INSTALL_PREFIX:PATH=/usr \ + cmake -Wno-dev -DCMAKE_INSTALL_PREFIX:PATH=/usr \ -DCMAKE_TOOLCHAIN_FILE="$(SCRIPT_DIR)/toolchain.cmake" \ ${CMAKE_FLAGS} ${WRKSRC}) $(MAKE_TRACE) else ifneq ($(filter minimal,${CONFIG_STYLE}),) -- cgit v1.2.3