From e9cd2c48c36ac18a3b50ab09e1ced545260d4b30 Mon Sep 17 00:00:00 2001 From: Michael Palimaka Date: Fri, 16 Oct 2015 01:03:23 +1100 Subject: [PATCH] cmake-utils.eclass: die if ninja is enabled but not installed This could happen if ninja is manually enabled (eg. make.conf) but not installed Gentoo-bug: 561570 --- eclass/cmake-utils.eclass | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass index 480cd099648c4..012b13f059c82 100644 --- a/eclass/cmake-utils.eclass +++ b/eclass/cmake-utils.eclass @@ -228,6 +228,11 @@ _generator_to_use() { case ${CMAKE_MAKEFILE_GENERATOR} in ninja) + # if ninja is enabled but not installed, the build could fail + # this could happen if ninja is manually enabled (eg. make.conf) but not installed + if ! has_version dev-util/ninja; then + die "CMAKE_MAKEFILE_GENERATOR is set to ninja, but ninja is not installed. Please install dev-util/ninja or unset CMAKE_MAKEFILE_GENERATOR." + fi generator_name="Ninja" ;; emake)