Move DBUS_USE_OUTPUT_DEBUG_STRING to config.h.cmake

Bug: https://gitlab.freedesktop.org/dbus/dbus/issues/117
Reviewed-by: Simon McVittie <smcv@collabora.com>

diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
index 743b38cc99dd6478e95cd4944b566ca315147ec2..61a9655a346faf03ea507e1e4751152932e3b46a 100644 (file)
--- 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 1be7731b48d45648e80adaf5f58a16f7f41cb81a..c296c05ad171f06380510d99fec90db87d59721f 100644 (file)
--- 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 */