summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaciej Mrozowski <reavertm@gentoo.org>2010-08-12 19:27:42 +0000
committerMaciej Mrozowski <reavertm@gentoo.org>2010-08-12 19:27:42 +0000
commit82428f5bfd1b00149cabbd5c9e2b74a466b5941c (patch)
treee07dc042f1ab07958ba2380410f795d0c93b3bf2 /eclass/cmake-utils.eclass
parentuncouple the video version from the game release (bug #330801) (diff)
downloadhistorical-82428f5bfd1b00149cabbd5c9e2b74a466b5941c.tar.gz
historical-82428f5bfd1b00149cabbd5c9e2b74a466b5941c.tar.bz2
historical-82428f5bfd1b00149cabbd5c9e2b74a466b5941c.zip
use debug && append-cppflags -DDEBUG.
Also prevent QDebug from flooding when ! use debug (Qt is common toolkit among cmake-controlled packages, we can add respective preprocessor definitions for other known common libs as well)
Diffstat (limited to 'eclass/cmake-utils.eclass')
-rw-r--r--eclass/cmake-utils.eclass12
1 files changed, 7 insertions, 5 deletions
diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index 2677bdcb1475..ab35391d05ce 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.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 $
# @ECLASS: cmake-utils.eclass
# @MAINTAINER:
@@ -30,7 +30,7 @@ WANT_CMAKE="${WANT_CMAKE:-always}"
# @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="${CMAKE_MIN_VERSION:-2.6.2-r1}"
CMAKEDEPEND=""
@@ -286,9 +286,11 @@ enable_cmake-utils_src_configure() {
# @SEE CMAKE_BUILD_TYPE
if [[ ${CMAKE_BUILD_TYPE} = 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