Moved a macro from taglib_config.h to config.h

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 80bc2dd3cd6248c99839fb2665f8a63314615682..91e1901d7db8c94c1aef462e1dd43e36ef528abd 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -92,7 +92,7 @@ endif()
 
 option(TRACE_IN_RELEASE "Output debug messages even in release mode"  OFF)
 if(TRACE_IN_RELEASE)
-  set(TAGLIB_TRACE_IN_RELEASE TRUE)
+  set(TRACE_IN_RELEASE TRUE)
 endif()
 
 configure_file(taglib/taglib_config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/taglib_config.h)

diff --git a/config.h.cmake b/config.h.cmake
index 15d2f997ed1b28df2b6d07524b2c19b8968dd787..f8dcbbde7479d5ab169cd3476169179f93e0f09d 100644 (file)
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -31,4 +31,7 @@
 /* Defined if you have libz */
 #cmakedefine   HAVE_ZLIB 1
 
+/* Indicates whether debug messages are shown even in release mode */
+#cmakedefine   TRACE_IN_RELEASE 1
+
 #cmakedefine TESTS_DIR "@TESTS_DIR@"

diff --git a/taglib/taglib_config.h.cmake b/taglib/taglib_config.h.cmake
index 4ccb0158de3c2d91f37583185672f8479498478b..0f499e2c2de7d6a7f9de18c3ff5570c4c487d8d7 100644 (file)
--- a/taglib/taglib_config.h.cmake
+++ b/taglib/taglib_config.h.cmake
@@ -2,5 +2,3 @@
 
 #define   TAGLIB_WITH_ASF 1
 #define   TAGLIB_WITH_MP4 1
-
-#cmakedefine   TAGLIB_TRACE_IN_RELEASE 1

diff --git a/taglib/toolkit/tdebug.cpp b/taglib/toolkit/tdebug.cpp
index f4025e9b4e280644cec15ec74c840d0aaa073de3..c838d57a9c8a9b7b1c84c072082e2b8816aeb726 100644 (file)
--- a/taglib/toolkit/tdebug.cpp
+++ b/taglib/toolkit/tdebug.cpp
@@ -24,7 +24,6 @@
  ***************************************************************************/
 
 #include "config.h"
-#include "taglib_config.h"
 
 #include "tdebug.h"
 #include "tstring.h"
@@ -68,7 +67,7 @@ namespace
 
 void TagLib::debug(const String &s)
 {
-#if !defined(NDEBUG) || defined(TAGLIB_TRACE_IN_RELEASE)
+#if !defined(NDEBUG) || defined(TRACE_IN_RELEASE)
   
   getDebugListener()->printMessage("TagLib: " + s + "\n");
 
@@ -77,7 +76,7 @@ void TagLib::debug(const String &s)
 
 void TagLib::debugData(const ByteVector &v)
 {
-#if !defined(NDEBUG) || defined(TAGLIB_TRACE_IN_RELEASE)
+#if !defined(NDEBUG) || defined(TRACE_IN_RELEASE)
 
   for(size_t i = 0; i < v.size(); ++i) 
   {