Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/
Date: Sun, 05 Jan 2020 13:55:46
Message-Id: 1578232532.390f5d6ab5d4d06559252d8054b16c12287aa617.asturm@gentoo
1 commit: 390f5d6ab5d4d06559252d8054b16c12287aa617
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jan 5 13:51:47 2020 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sun Jan 5 13:55:32 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=390f5d6a
7
8 cmake.eclass: Fix build with CMAKE_VERBOSE=OFF
9
10 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
11
12 eclass/cmake.eclass | 6 ++++--
13 1 file changed, 4 insertions(+), 2 deletions(-)
14
15 diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass
16 index c91e2dd4ada..4a02a646bb7 100644
17 --- a/eclass/cmake.eclass
18 +++ b/eclass/cmake.eclass
19 @@ -566,8 +566,10 @@ cmake_build() {
20 case ${CMAKE_MAKEFILE_GENERATOR} in
21 emake)
22 [[ -e Makefile ]] || die "Makefile not found. Error during configure stage."
23 - [[ "${CMAKE_VERBOSE}" != "OFF" ]] && local verbosity="VERBOSE=1"
24 - emake "${verbosity}" "$@"
25 + case ${CMAKE_VERBOSE} in
26 + OFF) emake VERBOSE=1 "$@" ;;
27 + *) emake "$@" ;;
28 + esac
29 ;;
30 ninja)
31 [[ -e build.ninja ]] || die "build.ninja not found. Error during configure stage."