diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -308,11 +308,6 @@
   set(CMAKE_CXX_FLAGS_DEBUGKMM  "${CMAKE_CXX_FLAGS_DEBUGFULL} -DKMM_DEBUG")
 endif()
 
-# and a variable we can use in the build environment to detect debug builds
-if(CMAKE_BUILD_TYPE MATCHES "[Dd][Ee][Bb][Uu][Gg]")
-  set(KMM_DEBUG "1")
-endif()
-
 option(USE_MODELTEST
   "Compile with ModelTest code (default=OFF)" OFF)
 
diff --git a/kmymoney/mymoney/CMakeLists.txt b/kmymoney/mymoney/CMakeLists.txt
--- a/kmymoney/mymoney/CMakeLists.txt
+++ b/kmymoney/mymoney/CMakeLists.txt
@@ -40,9 +40,7 @@
     ./storage/mymoneystoragenames.cpp
     )
 
-  if(KMM_DEBUG)
-    list(APPEND storage_a_SOURCES ./storage/mymoneystoragedump.cpp)
-  endif()
+list(APPEND storage_a_SOURCES $<$<OR:$<CONFIG:Debug>,$<CONFIG:DebugFull>,$<CONFIG:DebugKMM>>: ./storage/mymoneystoragedump.cpp>)
 
 list(APPEND kmm_mymoney_LIB_SRCS ${storage_a_SOURCES})