Move DBUS_ENABLE_EMBEDDED_TESTS and BUS_ENABLE_MODULAR_TESTS 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 d6a7c8a25431d2ebd00a1dd693afefd7de2c9dff..10e9d67abd4acb7983bb75cf9f4bfa1a77c57034 100644 (file)
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
@@ -305,7 +305,6 @@ option (DBUS_BUILD_TESTS "enable unit test code" ON)
 if(DBUS_BUILD_TESTS)
     set (DBUS_ENABLE_EMBEDDED_TESTS ON)
     set (DBUS_ENABLE_MODULAR_TESTS ON)
-    add_definitions(-DDBUS_ENABLE_EMBEDDED_TESTS -DDBUS_ENABLE_MODULAR_TESTS)
 endif(DBUS_BUILD_TESTS)
 
 option (DBUS_USE_OUTPUT_DEBUG_STRING "enable win32 debug port for message output" OFF)

diff --git a/cmake/config.h.cmake b/cmake/config.h.cmake
index f12e29829bb44ce85d078941e6d6804779bd4a4a..1be7731b48d45648e80adaf5f58a16f7f41cb81a 100644 (file)
--- a/cmake/config.h.cmake
+++ b/cmake/config.h.cmake
@@ -46,6 +46,9 @@
 #ifndef DBUS_DISABLE_CHECKS
 #  define DBUS_ENABLE_CHECKS 1
 #endif
+#cmakedefine DBUS_ENABLE_EMBEDDED_TESTS 1
+#cmakedefine DBUS_ENABLE_MODULAR_TESTS 1
+
 /* xmldocs */
 /* doxygen */
 #cmakedefine DBUS_GCOV_ENABLED 1