Moved a macro from taglib_config.h to config.h

This commit is contained in:
Tsuda Kageyu 2013-06-10 01:19:47 +09:00
parent 2f29ed003c
commit 6d2e0e8050
4 changed files with 6 additions and 6 deletions

View File

@ -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)

View File

@ -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@"

View File

@ -2,5 +2,3 @@
#define TAGLIB_WITH_ASF 1
#define TAGLIB_WITH_MP4 1
#cmakedefine TAGLIB_TRACE_IN_RELEASE 1

View File

@ -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)
{