diff options
Diffstat (limited to 'eclass')
| -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 285e5ccf98a..a77396f1b19 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 51e2b5884ee..7307733ae34 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 |