mirror of
https://github.com/coolsnowwolf/lede.git
synced 2025-04-16 14:23:38 +00:00
cmake.mk: sync with upstream
This commit is contained in:
parent
79d9040c5c
commit
0f103f7e83
@ -18,12 +18,13 @@ endif
|
|||||||
CMAKE_BINARY_DIR = $(PKG_BUILD_DIR)$(if $(CMAKE_BINARY_SUBDIR),/$(CMAKE_BINARY_SUBDIR))
|
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))
|
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_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) .)
|
MAKE_PATH = $(firstword $(CMAKE_BINARY_SUBDIR) .)
|
||||||
|
|
||||||
ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),)
|
ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),)
|
||||||
cmake_tool=$(TOOLCHAIN_DIR)/bin/$(1)
|
cmake_tool=$(TOOLCHAIN_DIR)/bin/$(1)
|
||||||
else
|
else
|
||||||
cmake_tool=$(shell which $(1))
|
cmake_tool=$(shell command -v $(1))
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(CONFIG_CCACHE),)
|
ifeq ($(CONFIG_CCACHE),)
|
||||||
@ -51,20 +52,21 @@ 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_DIR)$(if $(CONFIG_EXTERNAL_TOOLCHAIN),;$(CONFIG_TOOLCHAIN_ROOT))
|
||||||
CMAKE_HOST_FIND_ROOT_PATH:=$(STAGING_DIR)/host;$(STAGING_DIR_HOSTPKG);$(STAGING_DIR_HOST)
|
CMAKE_HOST_FIND_ROOT_PATH:=$(STAGING_DIR)/host;$(STAGING_DIR_HOSTPKG);$(STAGING_DIR_HOST)
|
||||||
CMAKE_SHARED_LDFLAGS:=-Wl,-Bsymbolic-functions
|
CMAKE_SHARED_LDFLAGS:=-Wl,-Bsymbolic-functions
|
||||||
|
CMAKE_HOST_INSTALL_PREFIX = $(HOST_BUILD_PREFIX)
|
||||||
|
|
||||||
ifeq ($(HOST_USE_NINJA),1)
|
ifeq ($(HOST_USE_NINJA),1)
|
||||||
CMAKE_HOST_OPTIONS += -DCMAKE_GENERATOR="Ninja"
|
CMAKE_HOST_OPTIONS += -DCMAKE_GENERATOR="Ninja"
|
||||||
|
|
||||||
define Host/Compile/Default
|
define Host/Compile/Default
|
||||||
+$(NINJA) -C $(HOST_BUILD_DIR) $(1)
|
+$(NINJA) -C $(HOST_CMAKE_BINARY_DIR) $(1)
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define Host/Install/Default
|
define Host/Install/Default
|
||||||
+$(NINJA) -C $(HOST_BUILD_DIR) install
|
+$(NINJA) -C $(HOST_CMAKE_BINARY_DIR) install
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define Host/Uninstall/Default
|
define Host/Uninstall/Default
|
||||||
+$(NINJA) -C $(HOST_BUILD_DIR) uninstall
|
+$(NINJA) -C $(HOST_CMAKE_BINARY_DIR) uninstall
|
||||||
endef
|
endef
|
||||||
endif
|
endif
|
||||||
|
|
||||||
@ -133,7 +135,8 @@ endef
|
|||||||
Build/InstallDev = $(if $(CMAKE_INSTALL),$(Build/InstallDev/cmake))
|
Build/InstallDev = $(if $(CMAKE_INSTALL),$(Build/InstallDev/cmake))
|
||||||
|
|
||||||
define Host/Configure/Default
|
define Host/Configure/Default
|
||||||
(cd $(HOST_BUILD_DIR); \
|
mkdir -p "$(HOST_CMAKE_BINARY_DIR)"
|
||||||
|
(cd $(HOST_CMAKE_BINARY_DIR); \
|
||||||
CFLAGS="$(HOST_CFLAGS)" \
|
CFLAGS="$(HOST_CFLAGS)" \
|
||||||
CXXFLAGS="$(HOST_CFLAGS)" \
|
CXXFLAGS="$(HOST_CFLAGS)" \
|
||||||
LDFLAGS="$(HOST_LDFLAGS)" \
|
LDFLAGS="$(HOST_LDFLAGS)" \
|
||||||
@ -155,7 +158,7 @@ define Host/Configure/Default
|
|||||||
-DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=ONLY \
|
-DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=ONLY \
|
||||||
-DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY \
|
-DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY \
|
||||||
-DCMAKE_STRIP=: \
|
-DCMAKE_STRIP=: \
|
||||||
-DCMAKE_INSTALL_PREFIX=$(HOST_BUILD_PREFIX) \
|
-DCMAKE_INSTALL_PREFIX=$(CMAKE_HOST_INSTALL_PREFIX) \
|
||||||
-DCMAKE_PREFIX_PATH=$(HOST_BUILD_PREFIX) \
|
-DCMAKE_PREFIX_PATH=$(HOST_BUILD_PREFIX) \
|
||||||
-DCMAKE_SKIP_RPATH=TRUE \
|
-DCMAKE_SKIP_RPATH=TRUE \
|
||||||
-DCMAKE_INSTALL_LIBDIR=lib \
|
-DCMAKE_INSTALL_LIBDIR=lib \
|
||||||
|
Loading…
Reference in New Issue
Block a user