X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;ds=sidebyside;f=include%2Fcmake.mk;h=a2ac62fcae170ebef5d9b594b9d19da592ff3cbb;hb=2764e91784d28559e8c6be2b99f5043a85fb7bdf;hp=4701020f91863cccb4a5b7e5c6a51b1cbf5d377f;hpb=a808a8e5276ff8e3012d1b54b9c3f29744889620;p=openwrt.git

diff --git a/include/cmake.mk b/include/cmake.mk
index 4701020f91..a2ac62fcae 100644
--- a/include/cmake.mk
+++ b/include/cmake.mk
@@ -1,6 +1,10 @@
 PKG_INSTALL:=1
 
-MAKE_FLAGS+=VERBOSE=1
+ifneq ($(findstring c,$(OPENWRT_VERBOSE)),)
+  MAKE_FLAGS+=VERBOSE=1
+endif
+
+CMAKE_SOURCE_DIR:=.
 
 ifeq ($(CONFIG_CCACHE),)
  ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),)
@@ -20,9 +24,9 @@ else
     CCACHE:=$(STAGING_DIR_HOST)/bin/ccache
   endif
   CMAKE_C_COMPILER:=$(CCACHE)
-  CMAKE_C_COMPILER_ARG1:=$(filter-out ccache,$(TARGET_CC))
+  CMAKE_C_COMPILER_ARG1:=$(TARGET_CC_NOCACHE)
   CMAKE_CXX_COMPILER:=$(CCACHE)
-  CMAKE_CXX_COMPILER_ARG1:=$(filter-out ccache,$(TARGET_CXX))
+  CMAKE_CXX_COMPILER_ARG1:=$(TARGET_CXX_NOCACHE)
 endif
 
 define Build/Configure/Default
@@ -44,15 +48,16 @@ define Build/Configure/Default
 			-DCMAKE_EXE_LINKER_FLAGS:STRING="$(TARGET_LDFLAGS)" \
 			-DCMAKE_MODULE_LINKER_FLAGS:STRING="$(TARGET_LDFLAGS)" \
 			-DCMAKE_SHARED_LINKER_FLAGS:STRING="$(TARGET_LDFLAGS)" \
-			-DCMAKE_FIND_ROOT_PATH=$(STAGING_DIR) \
+			-DCMAKE_FIND_ROOT_PATH="$(STAGING_DIR);$(TOOLCHAIN_DIR)" \
 			-DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=BOTH \
 			-DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=ONLY \
 			-DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY \
 			-DCMAKE_STRIP=: \
 			-DCMAKE_INSTALL_PREFIX=/usr \
 			-DDL_LIBRARY=$(STAGING_DIR) \
+                        -DCMAKE_PREFIX_PATH=$(STAGING_DIR) \
 			$(CMAKE_OPTIONS) \
-		. \
+		$(CMAKE_SOURCE_DIR) \
 	)
 endef