X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=include%2Fcmake.mk;h=b66665d20ae6bd21daf4f65b923bfc5d2cca8fd3;hb=5ede3fcdf74dcc1b1b4c9415152b2e8b26a45ead;hp=80c1b05937410cb9fce20e7b759577480cf390e7;hpb=3d71786154fbb3fcfbd652115f3e75db3f729941;p=oweals%2Fopenwrt.git diff --git a/include/cmake.mk b/include/cmake.mk index 80c1b05937..b66665d20a 100644 --- a/include/cmake.mk +++ b/include/cmake.mk @@ -7,8 +7,8 @@ ifneq ($(findstring c,$(OPENWRT_VERBOSE)),) endif CMAKE_BINARY_DIR = $(PKG_BUILD_DIR)$(if $(CMAKE_BINARY_SUBDIR),/$(CMAKE_BINARY_SUBDIR)) -CMAKE_SOURCE_DIR = $(PKG_BUILD_DIR) -HOST_CMAKE_SOURCE_DIR = $(HOST_BUILD_DIR) +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)) MAKE_PATH = $(firstword $(CMAKE_BINARY_SUBDIR) .) ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),) @@ -107,3 +107,7 @@ define Host/Configure/Default $(HOST_CMAKE_SOURCE_DIR) \ ) endef + +MAKE_FLAGS += \ + CMAKE_COMMAND='$$(if $$(CMAKE_DISABLE_$$@),:,$(STAGING_DIR_HOST)/bin/cmake)' \ + CMAKE_DISABLE_cmake_check_build_system=1