Commit: 102035373a48fddfa54f785168898d90343cf45a
Author: Brecht Van Lommel
Date: Mon Aug 12 15:20:31 2019 +0200
Branches: master
https://developer.blender.org/rB102035373a48fddfa54f785168898d90343cf45a
Build: automatically detect ninja build system when running "make"
So that you don't have to specify "make ninja" every time.
===================================================================
M GNUmakefile
===================================================================
diff --git a/GNUmakefile b/GNUmakefile
index 1ad7cc4fc27..2cd2c1a7443 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -230,11 +230,15 @@ endif
# -----------------------------------------------------------------------------
# build tool
-ifneq "$(findstring ninja, $(MAKECMDGOALS))" ""
- BUILD_COMMAND:=ninja
+ifeq "$(findstring ninja, $(MAKECMDGOALS))" ""
BUILD_CMAKE_ARGS:=$(BUILD_CMAKE_ARGS) -G Ninja
+ BUILD_COMMAND:=ninja
else
- BUILD_COMMAND:=make -s
+ ifneq ("$(wildcard $(BUILD_DIR)/build.ninja)","")
+ BUILD_COMMAND:=ninja
+ else
+ BUILD_COMMAND:=make -s
+ endif
endif
# -----------------------------------------------------------------------------
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
