Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix "make deps" error when building deps with make and Blender with ninja

Browse Source
This commit is contained in:
Brecht Van Lommel
2019-08-30 17:47:57 +02:00
parent bb8a9a6f8b
commit 410cde82e3
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
GNUmakefile
View File

@@ -233,12 +233,19 @@ endif
ifneq "$(findstring ninja, $(MAKECMDGOALS))" "" ifneq "$(findstring ninja, $(MAKECMDGOALS))" ""
BUILD_CMAKE_ARGS:=$(BUILD_CMAKE_ARGS) -G Ninja BUILD_CMAKE_ARGS:=$(BUILD_CMAKE_ARGS) -G Ninja
BUILD_COMMAND:=ninja BUILD_COMMAND:=ninja
DEPS_BUILD_COMMAND:=ninja
else else
ifneq ("$(wildcard $(BUILD_DIR)/build.ninja)","") ifneq ("$(wildcard $(BUILD_DIR)/build.ninja)","")
BUILD_COMMAND:=ninja BUILD_COMMAND:=ninja
else else
BUILD_COMMAND:=make -s BUILD_COMMAND:=make -s
endif endif
ifneq ("$(wildcard $(DEPS_BUILD_DIR)/build.ninja)","")
DEPS_BUILD_COMMAND:=ninja
else
DEPS_BUILD_COMMAND:=make -s
endif
endif endif
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
@@ -333,7 +340,7 @@ deps: .FORCE
@echo @echo
@echo Building dependencies ... @echo Building dependencies ...
$(BUILD_COMMAND) -C "$(DEPS_BUILD_DIR)" -j $(NPROCS) $(DEPS_TARGET) $(DEPS_BUILD_COMMAND) -C "$(DEPS_BUILD_DIR)" -j $(NPROCS) $(DEPS_TARGET)
@echo @echo
@echo Dependencies successfully built and installed to $(DEPS_INSTALL_DIR). @echo Dependencies successfully built and installed to $(DEPS_INSTALL_DIR).
@echo @echo