[gentoo-commits] repo/gentoo:master commit in: eclass/

[Michael Palimaka]

commit:     e9cd2c48c36ac18a3b50ab09e1ced545260d4b30
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 15 14:03:23 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Oct 17 17:23:56 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9cd2c48

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 480cd09..012b13f 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)