From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1OSZbl-0007zq-9f for garchives@archives.gentoo.org; Sat, 26 Jun 2010 17:56:01 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 583E4E09DF; Sat, 26 Jun 2010 17:56:00 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 39F72E09DF for ; Sat, 26 Jun 2010 17:56:00 +0000 (UTC) Received: from corvid.gentoo.org (corvid.gentoo.org [208.92.234.79]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D73D61B4108 for ; Sat, 26 Jun 2010 17:55:59 +0000 (UTC) Received: by corvid.gentoo.org (Postfix, from userid 2263) id 226F22CF7D; Sat, 26 Jun 2010 17:55:59 +0000 (UTC) From: "Maciej Mrozowski (reavertm)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, reavertm@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in eclass: cmake-utils.eclass X-VCS-Repository: gentoo-x86 X-VCS-Files: cmake-utils.eclass X-VCS-Directories: eclass X-VCS-Committer: reavertm X-VCS-Committer-Name: Maciej Mrozowski Content-Type: text/plain; charset=utf8 Message-Id: <20100626175559.226F22CF7D@corvid.gentoo.org> Date: Sat, 26 Jun 2010 17:55:59 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: d40f3468-febf-4ebc-8224-7485ac91ceed X-Archives-Hash: bc56cc63b96c4448b060d896a2231418 reavertm 10/06/26 17:55:59 Modified: cmake-utils.eclass Log: Properly handle NOCOLOR variable Revision Changes Path 1.54 eclass/cmake-utils.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/cmake-utils= .eclass?rev=3D1.54&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/cmake-utils= .eclass?rev=3D1.54&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/cmake-utils= .eclass?r1=3D1.53&r2=3D1.54 Index: cmake-utils.eclass =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/eclass/cmake-utils.eclass,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- cmake-utils.eclass 21 Jun 2010 16:39:49 -0000 1.53 +++ cmake-utils.eclass 26 Jun 2010 17:55:59 -0000 1.54 @@ -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 $ =20 # @ECLASS: cmake-utils.eclass # @MAINTAINER: @@ -308,7 +308,7 @@ SET (LIB_SUFFIX ${libdir/lib} CACHE STRING "library path suffix" FORCE= ) SET (CMAKE_INSTALL_LIBDIR ${libdir} CACHE PATH "Output directory for l= ibraries") _EOF_ - [[ -n ${NOCOLOR} ]] && echo 'SET (CMAKE_COLOR_MAKEFILE OFF CACHE BOOL "= pretty colors during make" FORCE)' >> "${common_config}" + [[ "${NOCOLOR}" =3D true || "${NOCOLOR}" =3D yes ]] && echo 'SET (CMAKE= _COLOR_MAKEFILE OFF CACHE BOOL "pretty colors during make" FORCE)' >> "${= common_config}" =20 # Convert mycmakeargs to an array, for backwards compatibility # Make the array a local variable since <=3Dportage-2.1.6.x does not