diff options
| author | Maciej Mrozowski <reavertm@gentoo.org> | 2010-08-13 07:07:37 +0200 |
|---|---|---|
| committer | Maciej Mrozowski <reavertm@gentoo.org> | 2010-08-13 07:09:14 +0200 |
| commit | 9542b7f301c04def036fa30af1410d95b61257de (patch) | |
| tree | faa4f5e4d667cab1f8767ed597d89395d08bba4c | |
| parent | 4974640c6765e2042ae4e362cbf6209272be3a1c (diff) | |
| download | kde-9542b7f301c04def036fa30af1410d95b61257de.tar.gz kde-9542b7f301c04def036fa30af1410d95b61257de.tar.bz2 kde-9542b7f301c04def036fa30af1410d95b61257de.zip | |
Revert "[eclass/cmake-utils/kde4-base] Do not abuse USE=debug to control compiler debug switches, just preprocessor definitions"
Revert "[eclass/cmake-utils,kde4-base] Silence QDebug messages in release builds"
This reverts commits ef3a4692d5dea7277405597679c2dd8f395ee6b0 and 8be26ab0ad5355cc27d2368247fd96f7b904cd0e.
| -rw-r--r-- | eclass/cmake-utils.eclass | 8 | ||||
| -rw-r--r-- | eclass/kde4-base.eclass | 13 |
2 files changed, 9 insertions, 12 deletions
diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass index a77396f1b19..9db9ec80bd9 100644 --- a/eclass/cmake-utils.eclass +++ b/eclass/cmake-utils.eclass @@ -281,11 +281,9 @@ enable_cmake-utils_src_configure() { # @SEE CMAKE_BUILD_TYPE 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 + # Handle release builds + if ! has debug ${IUSE//+} || ! use debug; then + append-cppflags -DNDEBUG fi fi diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass index 7307733ae34..f198c5dcc6c 100644 --- a/eclass/kde4-base.eclass +++ b/eclass/kde4-base.eclass @@ -626,13 +626,12 @@ kde4-base_src_configure() { cmakeargs+=(-DKDE4_ENABLE_FINAL=ON) fi - 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 + 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 fi # Set distribution name |