diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-02-22 11:43:11 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-06-10 18:31:31 +0100 |
| commit | 90f36efbc33201fd2c8fe8c8cbe09f7460c1930b (patch) | |
| tree | e1208c7bcc15998a93b560810460ad8b113bb5d4 /cmake | |
| parent | 77e208ac1da8f5840270207a31170a15b8d562f2 (diff) | |
| download | dbus-90f36efbc33201fd2c8fe8c8cbe09f7460c1930b.tar.gz | |
Add support for building "modular" tests, which require GLib and dbus-glib
For the moment, the CMake build system only knows about the existing
"embedded tests"; make it define both symbols, though.
We use GLib because it has GTester (and life's too short to write yet another
JUnit clone), and dbus-glib for the main-loop integration only (see
fd.o #31515 for thoughts on incorporating just those two functions in a
separate library in the dbus tarball).
I'm not using DBusLoop for the main loop because I specifically don't
want to use non-public API or ABI of libdbus in the modular tests. If we make
sure they work against a shared libdbus, we can use them to test the
installed system, with "make installcheck".
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=34570
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index 9b9ac546..7476975b 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -226,7 +226,7 @@ ENABLE_TESTING() OPTION(DBUS_BUILD_TESTS "enable unit test code" ON) if(DBUS_BUILD_TESTS) - add_definitions(-DDBUS_BUILD_TESTS) + add_definitions(-DDBUS_BUILD_TESTS -DDBUS_ENABLE_EMBEDDED_TESTS) endif(DBUS_BUILD_TESTS) OPTION(DBUS_USE_OUTPUT_DEBUG_STRING "enable win32 debug port for message output" OFF) |