From: Ralf Habacker Date: Tue, 16 Oct 2018 11:58:27 +0000 (+0200) Subject: Move DBUS_USE_OUTPUT_DEBUG_STRING to config.h.cmake X-Git-Tag: dbus-1.13.8~52 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ae728666d5af4919778e5714ea87d79d252b54fa;p=thirdparty%2Fdbus.git Move DBUS_USE_OUTPUT_DEBUG_STRING to config.h.cmake Bug: https://gitlab.freedesktop.org/dbus/dbus/issues/117 Reviewed-by: Simon McVittie --- diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index 743b38cc9..61a9655a3 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -308,10 +308,6 @@ if(DBUS_BUILD_TESTS) endif(DBUS_BUILD_TESTS) option (DBUS_USE_OUTPUT_DEBUG_STRING "enable win32 debug port for message output" OFF) -if(DBUS_USE_OUTPUT_DEBUG_STRING) - add_definitions(-DDBUS_USE_OUTPUT_DEBUG_STRING) -endif(DBUS_USE_OUTPUT_DEBUG_STRING) - if(WIN32) # win32 dbus service support - this support is not complete option (DBUS_SERVICE "enable dbus service installer" OFF) diff --git a/cmake/config.h.cmake b/cmake/config.h.cmake index 1be7731b4..c296c05ad 100644 --- a/cmake/config.h.cmake +++ b/cmake/config.h.cmake @@ -48,6 +48,7 @@ #endif #cmakedefine DBUS_ENABLE_EMBEDDED_TESTS 1 #cmakedefine DBUS_ENABLE_MODULAR_TESTS 1 +#cmakedefine DBUS_USE_OUTPUT_DEBUG_STRING 1 /* xmldocs */ /* doxygen */