298977887/lede
1
0
Fork 0
mirror of https://github.com/coolsnowwolf/lede.git synced 2025-04-16 04:13:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

tools/cmake: sync upstream

Browse Source
This commit is contained in:
Beginner-Go 2022-02-26 17:14:39 +00:00
parent 1874e4100b
commit 4a4649e04a
4 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tools/cmake/Makefile
View File

@ -30,7 +30,20 @@ HOST_CONFIGURE_VARS += \
HOST_CONFIGURE_ARGS := \ HOST_CONFIGURE_ARGS := \
$(if $(MAKE_JOBSERVER),--parallel="$(MAKE_JOBSERVER)") \ $(if $(MAKE_JOBSERVER),--parallel="$(MAKE_JOBSERVER)") \
--prefix=$(STAGING_DIR_HOST) --prefix="$(STAGING_DIR_HOST)" \
--generator=Ninja
define Host/Compile/Default
+$(NINJA) -C $(HOST_BUILD_DIR) $(1)
endef
define Host/Install/Default
+$(NINJA) -C $(HOST_BUILD_DIR) install
endef
define Host/Uninstall/Default
+$(NINJA) -C $(HOST_BUILD_DIR) uninstall
endef
ifneq ($(findstring c,$(OPENWRT_VERBOSE)),) ifneq ($(findstring c,$(OPENWRT_VERBOSE)),)
HOST_MAKE_FLAGS += VERBOSE=1 HOST_MAKE_FLAGS += VERBOSE=1

2
tools/cmake/patches/100-no-testing.patch
View File

@ -30,4 +30,4 @@
+ VTK_BUILD_TESTING:STRING=OFF + VTK_BUILD_TESTING:STRING=OFF
VTK_WRAP_PYTHON:BOOL=ON VTK_WRAP_PYTHON:BOOL=ON
ExternalData_OBJECT_STORES:FILEPATH=@base_dir@/ExternalData ExternalData_OBJECT_STORES:FILEPATH=@base_dir@/ExternalData
") ")

2
tools/cmake/patches/120-curl-fix-libressl-linking.patch
View File

@ -34,4 +34,4 @@ Signed-off-by: Jo-Philipp Wich <jo@mein.io>
+ endif() + endif()
list(APPEND CURL_LIBS ${OPENSSL_LIBRARIES}) list(APPEND CURL_LIBS ${OPENSSL_LIBRARIES})
include_directories(${OPENSSL_INCLUDE_DIR}) include_directories(${OPENSSL_INCLUDE_DIR})

2
tools/cmake/patches/130-bootstrap_parallel_make_flag.patch
View File

@ -11,4 +11,4 @@
+ cmake_make_flags="${cmake_make_flags} ${cmake_parallel_make}" + cmake_make_flags="${cmake_make_flags} ${cmake_parallel_make}"
fi fi
for a in ${cmake_make_processors}; do for a in ${cmake_make_processors}; do
if test -z "${cmake_make_processor}" && cmake_try_make "${a}" "${cmake_make_flags}" >> ../cmake_bootstrap.log 2>&1; then if test -z "${cmake_make_processor}" && cmake_try_make "${a}" "${cmake_make_flags}" >> ../cmake_bootstrap.log 2>&1; then