[Libreoffice-commits] .: sw/CppunitTest_sw_test_filters.mk sw/Library_swui.mk

Tor Lillqvist tml at kemper.freedesktop.org
Sun Sep 25 05:53:09 PDT 2011


 sw/CppunitTest_sw_test_filters.mk |    6 ++++++
 sw/Library_swui.mk                |    6 ++++++
 2 files changed, 12 insertions(+)

New commits:
commit e135afb73903ea16eeeedf49c0f68acb2f719534
Author: Tor Lillqvist <tml at iki.fi>
Date:   Sun Sep 25 15:49:42 2011 +0300

    Fix compilation when SYSTEM_LIBXML headers are not in /usr/include
    
    Need to use LIBXML_CFLAGS, that's what it's for.

diff --git a/sw/CppunitTest_sw_test_filters.mk b/sw/CppunitTest_sw_test_filters.mk
index 1411e7c..ba5f1a4 100644
--- a/sw/CppunitTest_sw_test_filters.mk
+++ b/sw/CppunitTest_sw_test_filters.mk
@@ -30,6 +30,12 @@
 
 $(eval $(call gb_CppunitTest_CppunitTest,sw_filters_test))
 
+ifeq ($(SYSTEM_LIBXML),YES)
+$(eval $(call gb_CppunitTest_add_cxxflags,sw_filters_test,\
+	$(LIBXML_CFLAGS) \
+))
+endif
+
 $(eval $(call gb_CppunitTest_add_exception_objects,sw_filters_test, \
     sw/qa/core/filters-test \
 ))
diff --git a/sw/Library_swui.mk b/sw/Library_swui.mk
index cc12e44..cf3ab04 100644
--- a/sw/Library_swui.mk
+++ b/sw/Library_swui.mk
@@ -44,6 +44,12 @@ $(eval $(call gb_Library_add_api,swui,\
 	offapi \
 ))
 
+ifeq ($(SYSTEM_LIBXML),YES)
+$(eval $(call gb_Library_add_cxxflags,swui,\
+	$(LIBXML_CFLAGS) \
+))
+endif
+
 $(eval $(call gb_Library_add_linked_libs,swui,\
     comphelper \
     cppu \


More information about the Libreoffice-commits mailing list