diff options
| author |   Maciej Mrozowski <reavertm@gentoo.org> | 2010-08-12 20:54:06 +0200 |
|---|---|---|
| committer | Maciej Mrozowski <reavertm@gentoo.org> | 2010-08-12 20:54:06 +0200 |
| commit | ef3a4692d5dea7277405597679c2dd8f395ee6b0 (patch) | |
| tree | 173f991500c475c3d7de27cb5ca57156450de359 | |
| parent | [eclass/cmake-utils,kde4-base] Silence QDebug messages in release builds (diff) | |
| download | kde-ef3a4692d5dea7277405597679c2dd8f395ee6b0.tar.gz kde-ef3a4692d5dea7277405597679c2dd8f395ee6b0.tar.bz2 kde-ef3a4692d5dea7277405597679c2dd8f395ee6b0.zip | |
[eclass/cmake-utils/kde4-base] Do not abuse USE=debug to control compiler debug switches, just preprocessor definitions
| -rw-r--r-- | eclass/cmake-utils.eclass | 6 | ||||
| -rw-r--r-- | eclass/kde4-base.eclass | 13 |
2 files changed, 11 insertions, 8 deletions
diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass index 285e5ccf98..a77396f1b1 100644 --- a/eclass/cmake-utils.eclass +++ b/eclass/cmake-utils.eclass @@ -281,8 +281,10 @@ 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 + # 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 diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass index 51e2b5884e..7307733ae3 100644 --- a/eclass/kde4-base.eclass +++ b/eclass/kde4-base.eclass @@ -626,12 +626,13 @@ kde4-base_src_configure() { 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 -DQT_NO_DEBUG_STREAM + 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 |