diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-08-30 18:47:57 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-08-30 18:57:18 +0300 |
| commit | 410cde82e352d5f4f3588a6e179a22779a7dd3ab (patch) | |
| tree | edcb477106c97d28578b85f089a5b4543393aa14 /GNUmakefile | |
| parent | bb8a9a6f8b8978fa1bf6567b4f9cd49dc9cf8662 (diff) | |
Fix "make deps" error when building deps with make and Blender with ninja
Diffstat (limited to 'GNUmakefile')
| -rw-r--r-- | GNUmakefile | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/GNUmakefile b/GNUmakefile index 4462a13207e..d17596d203d 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -233,12 +233,19 @@ endif ifneq "$(findstring ninja, $(MAKECMDGOALS))" "" BUILD_CMAKE_ARGS:=$(BUILD_CMAKE_ARGS) -G Ninja BUILD_COMMAND:=ninja + DEPS_BUILD_COMMAND:=ninja else ifneq ("$(wildcard $(BUILD_DIR)/build.ninja)","") BUILD_COMMAND:=ninja else BUILD_COMMAND:=make -s endif + + ifneq ("$(wildcard $(DEPS_BUILD_DIR)/build.ninja)","") + DEPS_BUILD_COMMAND:=ninja + else + DEPS_BUILD_COMMAND:=make -s + endif endif # ----------------------------------------------------------------------------- @@ -333,7 +340,7 @@ deps: .FORCE @echo @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 Dependencies successfully built and installed to $(DEPS_INSTALL_DIR). @echo |