diff options
| author | Ralf Habacker <ralf.habacker@freenet.de> | 2015-02-04 13:23:34 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2015-02-04 15:11:48 +0000 |
| commit | b36747519abfcbfdecbff320d086c757f2a51ace (patch) | |
| tree | ec76a0b6a424e29bc9ca49d1f89e0c20c7b97c28 /cmake | |
| parent | 9806240b783c52432871a6a1116d483cb70df0ed (diff) | |
| download | dbus-b36747519abfcbfdecbff320d086c757f2a51ace.tar.gz | |
Link tests to test-utils-glib.c under CMake too
[Separated out from a larger commit -smcv]
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=88964
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/test/CMakeLists.txt | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/cmake/test/CMakeLists.txt b/cmake/test/CMakeLists.txt index 7676586e..42c56041 100644 --- a/cmake/test/CMakeLists.txt +++ b/cmake/test/CMakeLists.txt @@ -72,6 +72,13 @@ add_test_executable(manual-tcp ${manual-tcp_SOURCES} ${DBUS_INTERNAL_LIBRARIES}) if(DBUS_WITH_GLIB) message(STATUS "with glib test apps") + + add_library(dbus-testutils-glib STATIC + ${CMAKE_SOURCE_DIR}/../test/test-utils-glib.h + ${CMAKE_SOURCE_DIR}/../test/test-utils-glib.c + ) + target_link_libraries(dbus-testutils-glib ${DBUS_INTERNAL_LIBRARIES}) + add_definitions( ${GLIB2_DEFINITIONS} ${GOBJECT_DEFINITIONS} @@ -80,7 +87,8 @@ if(DBUS_WITH_GLIB) ${GLIB2_INCLUDE_DIR} ${GOBJECT_INCLUDE_DIR} ) - set(TEST_LIBRARIES ${DBUS_INTERNAL_LIBRARIES} dbus-testutils ${GLIB2_LIBRARIES} ${GOBJECT_LIBRARIES}) + + set(TEST_LIBRARIES ${DBUS_INTERNAL_LIBRARIES} dbus-testutils dbus-testutils-glib ${GLIB2_LIBRARIES} ${GOBJECT_LIBRARIES}) add_test_executable(test-corrupt ${CMAKE_SOURCE_DIR}/../test/corrupt.c ${TEST_LIBRARIES}) add_test_executable(test-dbus-daemon ${CMAKE_SOURCE_DIR}/../test/dbus-daemon.c ${TEST_LIBRARIES}) |