X-Git-Url: https://git.archive.openwrt.org/?p=openwrt.git;a=blobdiff_plain;f=include%2Fcmake.mk;h=774632111fbeb26418261149c31e49d5fe24bf94;hp=4c4af502cc3889955c5ad69aef78f8f97cf54bb1;hb=602f57d51bc0feac8dae52964afaef61ce10f168;hpb=596c502b538685b4d1a811bd43f2fccf40aa94b0 diff --git a/include/cmake.mk b/include/cmake.mk index 4c4af502cc..774632111f 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) @@ -46,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