]> git.ipfire.org Git - thirdparty/dbus.git/commitdiff
Link tests to test-utils-glib.c under CMake too
authorRalf Habacker <ralf.habacker@freenet.de>
Wed, 4 Feb 2015 12:23:34 +0000 (13:23 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Wed, 4 Feb 2015 15:11:48 +0000 (15:11 +0000)
[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>
cmake/test/CMakeLists.txt

index 7676586e13ab17b50e3c84bf01cc02e53fa71de0..42c56041237ef32bcbe2112019054727050675f2 100644 (file)
@@ -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})