[Libreoffice-commits] core.git: sd/CppunitTest_sd_uimpress.mk

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Tue Aug 28 11:04:59 UTC 2018


 sd/CppunitTest_sd_uimpress.mk |    9 +++++++++
 1 file changed, 9 insertions(+)

New commits:
commit e82785887a13bdb8d8cd4d4c74df0c6c71ae52d4
Author:     Luboš Luňák <l.lunak at collabora.com>
AuthorDate: Mon Aug 27 13:21:37 2018 +0200
Commit:     Luboš Luňák <l.lunak at collabora.com>
CommitDate: Tue Aug 28 13:04:34 2018 +0200

    fix glib/bluetooth linking errors
    
    Since nobody else seems to have this problems, this may be possibly
    only specific to KDE builds or to using gold linker.
    
    Change-Id: I29359e298178b934a6232b78da684e55db590863
    Reviewed-on: https://gerrit.libreoffice.org/59655
    Tested-by: Jenkins
    Reviewed-by: Arkadiy Illarionov <qarkai at gmail.com>
    Reviewed-by: Luboš Luňák <l.lunak at collabora.com>

diff --git a/sd/CppunitTest_sd_uimpress.mk b/sd/CppunitTest_sd_uimpress.mk
index 627876f21822..e483fb59a59c 100644
--- a/sd/CppunitTest_sd_uimpress.mk
+++ b/sd/CppunitTest_sd_uimpress.mk
@@ -79,6 +79,15 @@ $(eval $(call gb_CppunitTest_use_externals,sd_uimpress,\
 	libxml2 \
 ))
 
+ifneq ($(DBUS_HAVE_GLIB),)
+$(eval $(call gb_CppunitTest_add_defs,sd_uimpress,\
+	$(DBUS_GLIB_CFLAGS) \
+))
+$(eval $(call gb_CppunitTest_add_libs,sd_uimpress,\
+	$(DBUS_GLIB_LIBS) \
+))
+endif
+
 $(eval $(call gb_CppunitTest_add_exception_objects,sd_uimpress,\
     sd/qa/unit/uimpress \
 ))


More information about the Libreoffice-commits mailing list