| 1 |
commit: 1a1805e4b675fd79113f6c35a8a74bd54e595e6e |
| 2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Oct 15 14:03:23 2015 +0000 |
| 4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Oct 26 17:03:20 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=1a1805e4 |
| 7 |
|
| 8 |
cmake-utils.eclass: die if ninja is enabled but not installed |
| 9 |
|
| 10 |
This could happen if ninja is manually enabled (eg. make.conf) but not installed |
| 11 |
|
| 12 |
Gentoo-bug: 561570 |
| 13 |
|
| 14 |
eclass/cmake-utils.eclass | 5 +++++ |
| 15 |
1 file changed, 5 insertions(+) |
| 16 |
|
| 17 |
diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass |
| 18 |
index 65950e7..c92759d 100644 |
| 19 |
--- a/eclass/cmake-utils.eclass |
| 20 |
+++ b/eclass/cmake-utils.eclass |
| 21 |
@@ -228,6 +228,11 @@ _generator_to_use() { |
| 22 |
|
| 23 |
case ${CMAKE_MAKEFILE_GENERATOR} in |
| 24 |
ninja) |
| 25 |
+ # if ninja is enabled but not installed, the build could fail |
| 26 |
+ # this could happen if ninja is manually enabled (eg. make.conf) but not installed |
| 27 |
+ if ! has_version dev-util/ninja; then |
| 28 |
+ die "CMAKE_MAKEFILE_GENERATOR is set to ninja, but ninja is not installed. Please install dev-util/ninja or unset CMAKE_MAKEFILE_GENERATOR." |
| 29 |
+ fi |
| 30 |
generator_name="Ninja" |
| 31 |
;; |
| 32 |
emake) |
Archives