From 7bfcccf7015a17ed972cd1d0608e07279e49585a Mon Sep 17 00:00:00 2001 From: Mahmoud Al-Qudsi Date: Sat, 10 Mar 2018 11:37:50 -0600 Subject: [PATCH] Use correct, platform-agnostic invocation of cmake in BSDmakefile cmake can (and should) be used to invoke the build/install command, instead of directly calling `ninja` or `make`, via the `--build DIR [--target TARGET]` syntax. --- BSDmakefile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/BSDmakefile b/BSDmakefile index 9c42ecf45..8ec93fb5e 100644 --- a/BSDmakefile +++ b/BSDmakefile @@ -13,15 +13,13 @@ PREFIX?=/usr/local .if $(GENERATOR) == "Ninja" BUILDFILE=build/build.ninja -BUILDCMD=ninja .else BUILDFILE=build/Makefile -BUILDCMD=make .endif .DEFAULT: build/fish build/fish: build/$(BUILDFILE) - cd build; $(BUILDCMD) + cmake --build build build: mkdir -p build @@ -31,7 +29,7 @@ build/$(BUILDFILE): build .PHONY: install install: build/fish - cd build; $(BUILDCMD) install + cmake --build build --target install .PHONY: clean clean: