From 04715e12f617a6d88e03036fa088aa7be1c62a16 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 29 Jan 2021 16:24:17 +0100
Subject: [PATCH] build-style/cmake: use ninja as default generator

closes #28304
---
 common/build-style/cmake.sh             | 7 ++++---
 common/environment/build-style/cmake.sh | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/common/build-style/cmake.sh b/common/build-style/cmake.sh
index 3135508b8b0..5e4f2dadc8c 100644
--- a/common/build-style/cmake.sh
+++ b/common/build-style/cmake.sh
@@ -62,6 +62,7 @@ _EOF
 
 	cmake_args+=" -DCMAKE_INSTALL_SBINDIR=bin"
 
+	export CMAKE_GENERATOR="${CMAKE_GENERATOR:-Ninja}"
 	# Override flags: https://gitlab.kitware.com/cmake/cmake/issues/19590
 	CFLAGS="${CFLAGS/ -pipe / }" CXXFLAGS="${CXXFLAGS/ -pipe / }" \
 		cmake ${cmake_args} ${configure_args} $(echo ${cmake_builddir}|sed \
@@ -72,7 +73,7 @@ _EOF
 }
 
 do_build() {
-	: ${make_cmd:=make}
+	: ${make_cmd:=ninja}
 
 	cd ${cmake_builddir:=build}
 	${make_cmd} ${makejobs} ${make_build_args} ${make_build_target}
@@ -92,14 +93,14 @@ do_check() {
 		fi
 	fi
 
-	: ${make_cmd:=make}
+	: ${make_cmd:=ninja}
 	: ${make_check_target:=test}
 
 	CTEST_OUTPUT_ON_FAILURE=TRUE ${make_cmd} ${make_check_args} ${make_check_target}
 }
 
 do_install() {
-	: ${make_cmd:=make}
+	: ${make_cmd:=ninja}
 	: ${make_install_target:=install}
 
 	cd ${cmake_builddir:=build}
diff --git a/common/environment/build-style/cmake.sh b/common/environment/build-style/cmake.sh
index 25bd8a388ec..c9e4d896159 100644
--- a/common/environment/build-style/cmake.sh
+++ b/common/environment/build-style/cmake.sh
@@ -1,5 +1,5 @@
 if [ "$CHROOT_READY" ]; then
 	if [[ "$hostmakedepends" != *"cmake-bootstrap"* ]]; then
-		hostmakedepends+=" cmake"
+		hostmakedepends+=" cmake ninja"
 	fi
 fi