From: Ralf Habacker <ralf.habacker@freenet.de>
Date: Wed, 4 Feb 2015 12:23:34 +0000 (+0100)
Subject: Link tests to test-utils-glib.c under CMake too
X-Git-Tag: dbus-1.9.10~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b36747519abfcbfdecbff320d086c757f2a51ace;p=thirdparty%2Fdbus.git

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>
---

diff --git a/cmake/test/CMakeLists.txt b/cmake/test/CMakeLists.txt
index 7676586e1..42c560412 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})