ipq40xx: fritzrepeater-1200: fix MDIO and PHY probing

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

diff --git a/include/cmake.mk b/include/cmake.mk
index 96c4d7df3479f2e8f9941573738e18895708d1c9..c82ba5f8099c2987f996cfdfc0d18695724e0cb7 100644 (file)
--- a/include/cmake.mk
+++ b/include/cmake.mk
@@ -1,5 +1,13 @@
 cmake_bool = $(patsubst %,-D%:BOOL=$(if $($(1)),ON,OFF),$(2))
 
+PKG_USE_NINJA ?= 1
+HOST_USE_NINJA ?= 1
+ifeq ($(PKG_USE_NINJA),1)
+  PKG_BUILD_PARALLEL ?= 1
+endif
+ifeq ($(HOST_USE_NINJA),1)
+  HOST_BUILD_PARALLEL ?= 1
+endif
 PKG_INSTALL:=1
 
 ifneq ($(findstring c,$(OPENWRT_VERBOSE)),)
@@ -10,12 +18,13 @@ endif
 CMAKE_BINARY_DIR = $(PKG_BUILD_DIR)$(if $(CMAKE_BINARY_SUBDIR),/$(CMAKE_BINARY_SUBDIR))
 CMAKE_SOURCE_DIR = $(PKG_BUILD_DIR)$(if $(CMAKE_SOURCE_SUBDIR),/$(CMAKE_SOURCE_SUBDIR))
 HOST_CMAKE_SOURCE_DIR = $(HOST_BUILD_DIR)$(if $(CMAKE_SOURCE_SUBDIR),/$(CMAKE_SOURCE_SUBDIR))
+HOST_CMAKE_BINARY_DIR = $(HOST_BUILD_DIR)$(if $(CMAKE_BINARY_SUBDIR),/$(CMAKE_BINARY_SUBDIR))
 MAKE_PATH = $(firstword $(CMAKE_BINARY_SUBDIR) .)
 
 ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),)
-  cmake_tool=$(TOOLCHAIN_DIR)/bin/$(1)
+  cmake_tool=$(firstword $(TOOLCHAIN_BIN_DIRS))/$(1)
 else
-  cmake_tool=$(shell which $(1))
+  cmake_tool=$(shell command -v $(1))
 endif
 
 ifeq ($(CONFIG_CCACHE),)
@@ -40,9 +49,38 @@ CMAKE_AR:=$(call cmake_tool,$(TARGET_AR))
 CMAKE_NM:=$(call cmake_tool,$(TARGET_NM))
 CMAKE_RANLIB:=$(call cmake_tool,$(TARGET_RANLIB))
 
-CMAKE_FIND_ROOT_PATH:=$(STAGING_DIR)/usr;$(TOOLCHAIN_DIR)$(if $(CONFIG_EXTERNAL_TOOLCHAIN),;$(CONFIG_TOOLCHAIN_ROOT))
+CMAKE_FIND_ROOT_PATH:=$(STAGING_DIR)/usr;$(TOOLCHAIN_ROOT_DIR)
 CMAKE_HOST_FIND_ROOT_PATH:=$(STAGING_DIR)/host;$(STAGING_DIR_HOSTPKG);$(STAGING_DIR_HOST)
 CMAKE_SHARED_LDFLAGS:=-Wl,-Bsymbolic-functions
+CMAKE_HOST_INSTALL_PREFIX = $(HOST_BUILD_PREFIX)
+
+ifeq ($(HOST_USE_NINJA),1)
+  CMAKE_HOST_OPTIONS += -DCMAKE_GENERATOR="Ninja"
+
+  define Host/Compile/Default
+       +$(NINJA) -C $(HOST_CMAKE_BINARY_DIR) $(1)
+  endef
+
+  define Host/Install/Default
+       +$(NINJA) -C $(HOST_CMAKE_BINARY_DIR) install
+  endef
+
+  define Host/Uninstall/Default
+       +$(NINJA) -C $(HOST_CMAKE_BINARY_DIR) uninstall
+  endef
+endif
+
+ifeq ($(PKG_USE_NINJA),1)
+  CMAKE_OPTIONS += -DCMAKE_GENERATOR="Ninja"
+
+  define Build/Compile/Default
+       +$(NINJA) -C $(CMAKE_BINARY_DIR) $(1)
+  endef
+
+  define Build/Install/Default
+       +DESTDIR="$(PKG_INSTALL_DIR)" $(NINJA) -C $(CMAKE_BINARY_DIR) install
+  endef
+endif
 
 define Build/Configure/Default
        mkdir -p $(CMAKE_BINARY_DIR)
@@ -51,6 +89,7 @@ define Build/Configure/Default
                CXXFLAGS="$(TARGET_CXXFLAGS) $(EXTRA_CXXFLAGS)" \
                LDFLAGS="$(TARGET_LDFLAGS) $(EXTRA_LDFLAGS)" \
                cmake \
+                       --no-warn-unused-cli \
                        -DCMAKE_SYSTEM_NAME=Linux \
                        -DCMAKE_SYSTEM_VERSION=1 \
                        -DCMAKE_SYSTEM_PROCESSOR=$(ARCH) \
@@ -97,11 +136,13 @@ endef
 Build/InstallDev = $(if $(CMAKE_INSTALL),$(Build/InstallDev/cmake))
 
 define Host/Configure/Default
-       (cd $(HOST_BUILD_DIR); \
+       mkdir -p "$(HOST_CMAKE_BINARY_DIR)"
+       (cd $(HOST_CMAKE_BINARY_DIR); \
                CFLAGS="$(HOST_CFLAGS)" \
                CXXFLAGS="$(HOST_CFLAGS)" \
                LDFLAGS="$(HOST_LDFLAGS)" \
                cmake \
+                       --no-warn-unused-cli \
                        -DCMAKE_BUILD_TYPE=Release \
                        -DCMAKE_C_COMPILER_LAUNCHER="$(CMAKE_C_COMPILER_LAUNCHER)" \
                        -DCMAKE_C_COMPILER="$(CMAKE_HOST_C_COMPILER)" \
@@ -119,7 +160,7 @@ define Host/Configure/Default
                        -DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=ONLY \
                        -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY \
                        -DCMAKE_STRIP=: \
-                       -DCMAKE_INSTALL_PREFIX=$(HOST_BUILD_PREFIX) \
+                       -DCMAKE_INSTALL_PREFIX=$(CMAKE_HOST_INSTALL_PREFIX) \
                        -DCMAKE_PREFIX_PATH=$(HOST_BUILD_PREFIX) \
                        -DCMAKE_SKIP_RPATH=TRUE  \
                        -DCMAKE_INSTALL_LIBDIR=lib \