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 1OjdRL-0005sI-54 for garchives@archives.gentoo.org; Thu, 12 Aug 2010 19:27:47 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9F8BDE09D9; Thu, 12 Aug 2010 19:27:44 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 7692CE09D9 for ; Thu, 12 Aug 2010 19:27:44 +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 03FBB1B412C for ; Thu, 12 Aug 2010 19:27:44 +0000 (UTC) Received: by corvid.gentoo.org (Postfix, from userid 2263) id 0E4252CE15; Thu, 12 Aug 2010 19:27:43 +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: <20100812192743.0E4252CE15@corvid.gentoo.org> Date: Thu, 12 Aug 2010 19:27:43 +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: 50a43479-cc67-4e27-9dbd-81b1f5ae4214 X-Archives-Hash: b40648456b6062d1836a7200ef2168e7 reavertm 10/08/12 19:27:42 Modified: cmake-utils.eclass Log: use debug && append-cppflags -DDEBUG. Also prevent QDebug from flooding when ! use debug (Qt is common toolki= t among cmake-controlled packages, we can add respective preprocessor def= initions for other known common libs as well) Revision Changes Path 1.57 eclass/cmake-utils.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/cmake-utils= .eclass?rev=3D1.57&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/cmake-utils= .eclass?rev=3D1.57&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/cmake-utils= .eclass?r1=3D1.56&r2=3D1.57 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.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- cmake-utils.eclass 14 Jul 2010 15:48:43 -0000 1.56 +++ cmake-utils.eclass 12 Aug 2010 19:27:42 -0000 1.57 @@ -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.56 2010= /07/14 15:48:43 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/cmake-utils.eclass,v 1.57 2010= /08/12 19:27:42 reavertm Exp $ =20 # @ECLASS: cmake-utils.eclass # @MAINTAINER: @@ -30,7 +30,7 @@ =20 # @ECLASS-VARIABLE: CMAKE_MIN_VERSION # @DESCRIPTION: -# Specify the minimum allowable version of cmake. Defaults to 2.6.2-r1 +# Specify the minimum required CMake version. Default is 2.6.2-r1 CMAKE_MIN_VERSION=3D"${CMAKE_MIN_VERSION:-2.6.2-r1}" =20 CMAKEDEPEND=3D"" @@ -286,9 +286,11 @@ =20 # @SEE CMAKE_BUILD_TYPE if [[ ${CMAKE_BUILD_TYPE} =3D Gentoo ]]; then - # Handle release builds - if ! has debug ${IUSE//+} || ! use debug; then - append-cppflags -DNDEBUG + # Handle debug and release codepaths + if has debug ${IUSE//+} && use debug; then + append-cppflags -DDEBUG + else + append-cppflags -DNDEBUG -DQT_NO_DEBUG -DQT_NO_DEBUG_STREAM fi fi =20