aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile51
1 files changed, 32 insertions, 19 deletions
diff --git a/Makefile b/Makefile
index 405498c817..9cf4a58894 100644
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,6 @@
+filter-false = $(strip $(filter-out 0 off OFF false FALSE,$1))
+filter-true = $(strip $(filter-out 1 on ON true TRUE,$1))
+
-include local.mk
CMAKE_BUILD_TYPE ?= Debug
@@ -9,23 +12,23 @@ BUILD_TYPE ?= $(shell (type ninja > /dev/null 2>&1 && echo "Ninja") || \
ifeq (,$(BUILD_TOOL))
ifeq (Ninja,$(BUILD_TYPE))
- ifneq ($(shell cmake --help 2>/dev/null | grep Ninja),)
- BUILD_TOOL := ninja
- else
- # User's version of CMake doesn't support Ninja
- BUILD_TOOL = $(MAKE)
- BUILD_TYPE := Unix Makefiles
- endif
- else
+ ifneq ($(shell cmake --help 2>/dev/null | grep Ninja),)
+ BUILD_TOOL := ninja
+ else
+ # User's version of CMake doesn't support Ninja
BUILD_TOOL = $(MAKE)
+ BUILD_TYPE := Unix Makefiles
+ endif
+ else
+ BUILD_TOOL = $(MAKE)
endif
endif
ifneq ($(VERBOSE),)
- # Only need to handle Ninja here. Make will inherit the VERBOSE variable.
- ifeq ($(BUILD_TYPE),Ninja)
- VERBOSE_FLAG := -v
- endif
+ # Only need to handle Ninja here. Make will inherit the VERBOSE variable.
+ ifeq ($(BUILD_TYPE),Ninja)
+ VERBOSE_FLAG := -v
+ endif
endif
BUILD_CMD = $(BUILD_TOOL) $(VERBOSE_FLAG)
@@ -33,9 +36,14 @@ BUILD_CMD = $(BUILD_TOOL) $(VERBOSE_FLAG)
# Extra CMake flags which extend the default set
CMAKE_EXTRA_FLAGS ?=
DEPS_CMAKE_FLAGS ?=
+USE_BUNDLED_DEPS ?=
-# For use where we want to make sure only a single job is run. This also avoids
-# any warnings from the sub-make.
+ifneq (,$(USE_BUNDLED_DEPS))
+ BUNDLED_CMAKE_FLAG := -DUSE_BUNDLED=$(USE_BUNDLED_DEPS)
+endif
+
+# For use where we want to make sure only a single job is run. This does issue
+# a warning, but we need to keep SCRIPTS argument.
SINGLE_MAKE = export MAKEFLAGS= ; $(MAKE)
all: nvim
@@ -48,21 +56,26 @@ cmake:
$(MAKE) build/.ran-cmake
build/.ran-cmake: | deps
- mkdir -p build
cd build && cmake -G '$(BUILD_TYPE)' $(CMAKE_FLAGS) $(CMAKE_EXTRA_FLAGS) ..
touch $@
-deps: | .deps/build/third-party/.ran-cmake
+deps: | build/.ran-third-party-cmake
+ifeq ($(call filter-true,$(USE_BUNDLED_DEPS)),)
+$(BUILD_CMD) -C .deps/build/third-party
+endif
-.deps/build/third-party/.ran-cmake:
+build/.ran-third-party-cmake:
+ifeq ($(call filter-true,$(USE_BUNDLED_DEPS)),)
mkdir -p .deps/build/third-party
cd .deps/build/third-party && \
- cmake -G '$(BUILD_TYPE)' $(DEPS_CMAKE_FLAGS) ../../../third-party
+ cmake -G '$(BUILD_TYPE)' $(BUNDLED_CMAKE_FLAG) \
+ $(DEPS_CMAKE_FLAGS) ../../../third-party
+endif
+ mkdir -p build
touch $@
test: | nvim
- +$(SINGLE_MAKE) -C src/nvim/testdir
+ +$(SINGLE_MAKE) -C src/nvim/testdir $(MAKEOVERRIDES)
unittest: | nvim
+$(BUILD_CMD) -C build unittest