From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 8550613888F for ; Mon, 26 Oct 2015 17:03:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 049E8E083C; Mon, 26 Oct 2015 17:03:41 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A37D0E083C for ; Mon, 26 Oct 2015 17:03:39 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5EC58340B28 for ; Mon, 26 Oct 2015 17:03:38 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E90921712 for ; Mon, 26 Oct 2015 17:03:35 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1445879000.1a1805e4b675fd79113f6c35a8a74bd54e595e6e.kensington@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: eclass/ X-VCS-Repository: proj/kde X-VCS-Files: eclass/cmake-utils.eclass X-VCS-Directories: eclass/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: 1a1805e4b675fd79113f6c35a8a74bd54e595e6e X-VCS-Branch: master Date: Mon, 26 Oct 2015 17:03:35 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 463aef0a-66f1-4d10-8abe-3c578979c667 X-Archives-Hash: 85af4aa33258da30c0b033e9ec5f3e17 commit: 1a1805e4b675fd79113f6c35a8a74bd54e595e6e Author: Michael Palimaka gentoo org> AuthorDate: Thu Oct 15 14:03:23 2015 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Mon Oct 26 17:03:20 2015 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=1a1805e4 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 65950e7..c92759d 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)