[gentoo-commits] gentoo-x86 commit in eclass: kde4-base.eclass

["Maciej Mrozowski (reavertm)" <reavertm@gentoo.org>]

reavertm    10/08/12 19:32:23

  Modified:             kde4-base.eclass
  Log:
  Handle USE=debug in the same way as cmake-utils, do not abuse it with CMAkE_BUILD_TYPE=Debugfull (it can be done when needed anyway - see CMAKE_BUILD_TYPE section in cmake-utils.eclass(5))

Revision  Changes    Path
1.67                 eclass/kde4-base.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.67&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.67&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?r1=1.66&r2=1.67

Index: kde4-base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- kde4-base.eclass	9 Aug 2010 15:59:04 -0000	1.66
+++ kde4-base.eclass	12 Aug 2010 19:32:23 -0000	1.67
@@ -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/kde4-base.eclass,v 1.66 2010/08/09 15:59:04 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.67 2010/08/12 19:32:23 reavertm Exp $
 
 # @ECLASS: kde4-base.eclass
 # @MAINTAINER:
@@ -645,12 +645,13 @@
 		cmakeargs+=(-DKDE4_ENABLE_FINAL=ON)
 	fi
 
-	if has debug ${IUSE//+} && use debug; then
-		# Set "real" debug mode
-		CMAKE_BUILD_TYPE="Debugfull"
-	else
-		# Handle common release builds
-		append-cppflags -DQT_NO_DEBUG
+	if [[ ${CMAKE_BUILD_TYPE} = Gentoo ]]; then
+		# 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
 
 	# Set distribution name