X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=include%2Fcmake.mk;h=7ff97f5df8f42671e2fe2a58d3978bb1bba5d705;hb=6afb13e7952c2f3e6e0f3924b5a032621f436563;hp=09a0a2419f8206f2331ce386409a462430f990d6;hpb=027668ae08aaac2fd5130551627403c1917c0a82;p=openwrt-10.03%2F.git

diff --git a/include/cmake.mk b/include/cmake.mk
index 09a0a2419..7ff97f5df 100644
--- a/include/cmake.mk
+++ b/include/cmake.mk
@@ -2,6 +2,18 @@ PKG_INSTALL:=1
 
 MAKE_FLAGS+=VERBOSE=1
 
+ifeq ($(CONFIG_CCACHE),)
+  CMAKE_C_COMPILER:=$(TOOLCHAIN_DIR)/usr/bin/$(TARGET_CC)
+  CMAKE_C_COMPILER_ARG1:=
+  CMAKE_CXX_COMPILER:=$(TOOLCHAIN_DIR)/usr/bin/$(TARGET_CXX)
+  CMAKE_CXX_COMPILER_ARG1:=
+else
+  CMAKE_C_COMPILER:=$(STAGING_DIR_HOST)/bin/ccache
+  CMAKE_C_COMPILER_ARG1:=$(filter-out ccache,$(TARGET_CC))
+  CMAKE_CXX_COMPILER:=$(STAGING_DIR_HOST)/bin/ccache
+  CMAKE_CXX_COMPILER_ARG1:=$(filter-out ccache,$(TARGET_CXX))
+endif
+
 define Build/Configure/Default
 	(cd $(PKG_BUILD_DIR); \
 		CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \
@@ -13,15 +25,17 @@ define Build/Configure/Default
 			-DCMAKE_BUILD_TYPE=Release \
 			-DCMAKE_C_FLAGS_RELEASE="-DNDEBUG" \
 			-DCMAKE_CXX_FLAGS_RELEASE="-DNDEBUG" \
-			-DCMAKE_C_COMPILER=$(TOOLCHAIN_DIR)/bin/$(TARGET_CC) \
-			-DCMAKE_CXX_COMPILER=$(TOOLCHAIN_DIR)/bin/$(TARGET_CXX) \
+			-DCMAKE_C_COMPILER="$(CMAKE_C_COMPILER)" \
+			-DCMAKE_C_COMPILER_ARG1="$(CMAKE_C_COMPILER_ARG1)" \
+			-DCMAKE_CXX_COMPILER="$(CMAKE_CXX_COMPILER)" \
+			-DCMAKE_CXX_COMPILER_ARG1="$(CMAKE_CXX_COMPILER_ARG1)" \
 			-DCMAKE_EXE_LINKER_FLAGS="$(TARGET_LDFLAGS)" \
 			-DCMAKE_MODULE_LINKER_FLAGS="$(TARGET_LDFLAGS)" \
 			-DCMAKE_SHARED_LINKER_FLAGS="$(TARGET_LDFLAGS)" \
 			-DCMAKE_FIND_ROOT_PATH=$(STAGING_DIR) \
-			-DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=$(STAGING_DIR_HOST) \
-			-DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=$(STAGING_DIR) \
-			-DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=$(STAGING_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 \
 			$(CMAKE_OPTIONS) \