diff options
| author | Tor Lillqvist <tml@iki.fi> | 2011-09-25 15:49:42 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2011-09-25 15:52:55 +0300 |
| commit | e135afb73903ea16eeeedf49c0f68acb2f719534 (patch) | |
| tree | 6341e7aa2b09a3c9064818eea5cf8e2789cf0d5e /sw | |
| parent | c1e82b1c64ee863771bfc5958c2898ab1f650606 (diff) | |
Fix compilation when SYSTEM_LIBXML headers are not in /usr/include
Need to use LIBXML_CFLAGS, that's what it's for.
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/CppunitTest_sw_test_filters.mk | 6 | ||||
| -rw-r--r-- | sw/Library_swui.mk | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/sw/CppunitTest_sw_test_filters.mk b/sw/CppunitTest_sw_test_filters.mk index 1411e7cf1b5f..ba5f1a4542e0 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 cc12e447d025..cf3ab0459e71 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 \ |