Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2019-08-12 16:20:31 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2019-08-12 16:24:23 +0300
commit102035373a48fddfa54f785168898d90343cf45a (patch)
tree15e6c8b723dac2f752d3164d3b6cef321f30f032 /GNUmakefile
parent922e77036b3b3ea5b3304d1fa2055c526356258c (diff)
Build: automatically detect ninja build system when running "make"
So that you don't have to specify "make ninja" every time.
Diffstat (limited to 'GNUmakefile')
-rw-r--r--GNUmakefile10
1 files changed, 7 insertions, 3 deletions
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
# -----------------------------------------------------------------------------