diff options
| author |   Maciej Mrozowski <reavertm@gentoo.org> | 2010-06-26 17:55:59 +0000 |
|---|---|---|
| committer | Maciej Mrozowski <reavertm@gentoo.org> | 2010-06-26 17:55:59 +0000 |
| commit | 49349a47ef4a8af50f481d2ee77e8045c95db8a1 (patch) | |
| tree | 89ccc15364afc54e2bcba14835a64819e5224ac9 | |
| parent | old (diff) | |
| download | gentoo-2-49349a47ef4a8af50f481d2ee77e8045c95db8a1.tar.gz gentoo-2-49349a47ef4a8af50f481d2ee77e8045c95db8a1.tar.bz2 gentoo-2-49349a47ef4a8af50f481d2ee77e8045c95db8a1.zip | |
Properly handle NOCOLOR variable
| -rw-r--r-- | eclass/cmake-utils.eclass | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass index 2247c8625be1..91d7b9e70575 100644 --- a/eclass/cmake-utils.eclass +++ b/eclass/cmake-utils.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/cmake-utils.eclass,v 1.53 2010/06/21 16:39:49 reavertm Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/cmake-utils.eclass,v 1.54 2010/06/26 17:55:59 reavertm Exp $ # @ECLASS: cmake-utils.eclass # @MAINTAINER: @@ -308,7 +308,7 @@ enable_cmake-utils_src_configure() { SET (LIB_SUFFIX ${libdir/lib} CACHE STRING "library path suffix" FORCE) SET (CMAKE_INSTALL_LIBDIR ${libdir} CACHE PATH "Output directory for libraries") _EOF_ - [[ -n ${NOCOLOR} ]] && echo 'SET (CMAKE_COLOR_MAKEFILE OFF CACHE BOOL "pretty colors during make" FORCE)' >> "${common_config}" + [[ "${NOCOLOR}" = true || "${NOCOLOR}" = yes ]] && echo 'SET (CMAKE_COLOR_MAKEFILE OFF CACHE BOOL "pretty colors during make" FORCE)' >> "${common_config}" # Convert mycmakeargs to an array, for backwards compatibility # Make the array a local variable since <=portage-2.1.6.x does not |