From: nbd Date: Fri, 17 May 2013 14:19:36 +0000 (+0000) Subject: cmake.mk: add support for overriding the source dir, and define the cmake prefix... X-Git-Url: http://207.154.207.93/?a=commitdiff_plain;h=d8055e664986ef467d0e1e65d469dc364fbb665b;p=12.09%2Fopenwrt.git cmake.mk: add support for overriding the source dir, and define the cmake prefix path to avoid picking up host libraries for target builds (patch by Henning Rogge) Backport of r34914 git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@36652 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- diff --git a/include/cmake.mk b/include/cmake.mk index 4c4af50..64a0654 100644 --- a/include/cmake.mk +++ b/include/cmake.mk @@ -4,6 +4,8 @@ ifneq ($(findstring c,$(OPENWRT_VERBOSE)),) MAKE_FLAGS+=VERBOSE=1 endif +CMAKE_SOURCE_DIR:=. + ifeq ($(CONFIG_CCACHE),) ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),) CMAKE_C_COMPILER:=$(TOOLCHAIN_DIR)/bin/$(TARGET_CC) @@ -53,8 +55,9 @@ define Build/Configure/Default -DCMAKE_STRIP=: \ -DCMAKE_INSTALL_PREFIX=/usr \ -DDL_LIBRARY=$(STAGING_DIR) \ + -DCMAKE_PREFIX_PATH=$(STAGING_DIR) \ $(CMAKE_OPTIONS) \ - . \ + $(CMAKE_SOURCE_DIR) \ ) endef