summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-09-28 16:15:35 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2014-09-28 23:36:48 +0200
commitf9b7a115ea6f86a58d09a361ae58b78ff66933f7 (patch)
tree57e65e646e144498ceabff4a06322ac9c8d81879 /mk
parentafdec018629c7261c653fe952d29fcece78606ae (diff)
update cmake, fix cmake config file
Diffstat (limited to 'mk')
-rw-r--r--mk/pkg-bottom.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk
index 4296c98c3..ed892ce2c 100644
--- a/mk/pkg-bottom.mk
+++ b/mk/pkg-bottom.mk
@@ -64,10 +64,10 @@ else ifneq ($(filter cmake,${CONFIG_STYLE}),)
-e "s#@@TARGET_CFLAGS@@#$(TARGET_CFLAGS)#" \
-e "s#@@TARGET_CXXFLAGS@@#$(TARGET_CXXFLAGS)#" \
-e "s#@@STAGING_TARGET_DIR@@#$(STAGING_TARGET_DIR)#" \
- -e "s#@@STAGING_HOST_DIR@@#$(STAGING_HOST_DIR)#" \
+ -e "s#@@STAGING_HOST_DIR@@#$(STAGING_HOST_DIR)#g" \
$(SCRIPT_DIR)/toolchain.cmake.in > $(SCRIPT_DIR)/toolchain.cmake
(cd ${WRKBUILD} && PATH='${HOST_PATH}' \
- cmake -Wno-dev -DCMAKE_INSTALL_PREFIX:PATH=/usr \
+ cmake VERBOSE=1 -Wno-dev -DCMAKE_INSTALL_PREFIX:PATH=/usr \
-DCMAKE_TOOLCHAIN_FILE="$(SCRIPT_DIR)/toolchain.cmake" \
${CMAKE_FLAGS} ${WRKSRC})
else ifneq ($(filter minimal,${CONFIG_STYLE}),)