image: ext4: move ext4 specific options into submenu

[openwrt/openwrt.git] / include / cmake.mk

diff --git a/include/cmake.mk b/include/cmake.mk
index 4c4af502cc3889955c5ad69aef78f8f97cf54bb1..23ac56c377df1b3246965c42c1239e0da8441b34 100644 (file)
--- a/include/cmake.mk
+++ b/include/cmake.mk
@@ -4,28 +4,31 @@ ifneq ($(findstring c,$(OPENWRT_VERBOSE)),)
   MAKE_FLAGS+=VERBOSE=1
 endif
 
+CMAKE_SOURCE_DIR:=.
+
+ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),)
+  cmake_tool=$(TOOLCHAIN_DIR)/bin/$(1)
+else
+  cmake_tool=$(shell which $(1))
+endif
+
 ifeq ($(CONFIG_CCACHE),)
- ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),)
-  CMAKE_C_COMPILER:=$(TOOLCHAIN_DIR)/bin/$(TARGET_CC)
-  CMAKE_C_COMPILER_ARG1:=
-  CMAKE_CXX_COMPILER:=$(TOOLCHAIN_DIR)/bin/$(TARGET_CXX)
-  CMAKE_CXX_COMPILER_ARG1:=
- else
-  CMAKE_C_COMPILER:=$(shell which $(TARGET_CC))
-  CMAKE_C_COMPILER_ARG1:=
-  CMAKE_CXX_COMPILER:=$(shell which $(TARGET_CXX))
-  CMAKE_CXX_COMPILER_ARG1:=
- endif
+ CMAKE_C_COMPILER:=$(call cmake_tool,$(TARGET_CC))
+ CMAKE_CXX_COMPILER:=$(call cmake_tool,$(TARGET_CXX))
+ CMAKE_C_COMPILER_ARG1:=
+ CMAKE_CXX_COMPILER_ARG1:=
 else
   CCACHE:=$(shell which ccache)
   ifeq ($(CCACHE),)
     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
+CMAKE_AR:=$(call cmake_tool,$(TARGET_CROSS)ar)
+CMAKE_RANLIB:=$(call cmake_tool,$(TARGET_CROSS)ranlib)
 
 define Build/Configure/Default
        (cd $(PKG_BUILD_DIR); \
@@ -46,15 +49,18 @@ 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_AR="$(CMAKE_AR)" \
+                       -DCMAKE_RANLIB="$(CMAKE_RANLIB)" \
+                       -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