diff options
| author | Michael Stahl <mstahl@redhat.com> | 2016-10-07 21:19:19 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2016-10-07 21:35:04 +0200 |
| commit | 82f3b262f887f832a84ce969cf2da0eedf5babbe (patch) | |
| tree | 97b146105225493e679d561d0dca75e1c8724f76 /xmloff/CppunitTest_xmloff_uxmloff.mk | |
| parent | d6b27080a356d25e87ca2701a4e1e5d2bdc2630f (diff) | |
xmloff: fix --enable-mergelibs build
... by merging all object-using CppunitTests into uxmloff, which is
already disabled for MERGELIBS.
Change-Id: I12ad08660fd714cceba2fe9b855cdb1bbda19c2d
Diffstat (limited to 'xmloff/CppunitTest_xmloff_uxmloff.mk')
| -rw-r--r-- | xmloff/CppunitTest_xmloff_uxmloff.mk | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/xmloff/CppunitTest_xmloff_uxmloff.mk b/xmloff/CppunitTest_xmloff_uxmloff.mk index 7e517229b47f..45eb4178f311 100644 --- a/xmloff/CppunitTest_xmloff_uxmloff.mk +++ b/xmloff/CppunitTest_xmloff_uxmloff.mk @@ -11,9 +11,9 @@ $(eval $(call gb_CppunitTest_CppunitTest,xmloff_uxmloff)) $(eval $(call gb_CppunitTest_add_exception_objects,xmloff_uxmloff, \ xmloff/qa/unit/uxmloff \ + xmloff/qa/unit/tokenmap-test \ )) - $(eval $(call gb_CppunitTest_set_include,xmloff_uxmloff,\ -I$(SRCDIR)/xmloff/inc \ -I$(SRCDIR)/xmloff/source/style \ @@ -21,6 +21,10 @@ $(eval $(call gb_CppunitTest_set_include,xmloff_uxmloff,\ $$(INCLUDE) \ )) +$(eval $(call gb_CppunitTest_use_custom_headers,xmloff_uxmloff, \ + xmloff/generated \ +)) + $(eval $(call gb_CppunitTest_use_sdk_api,xmloff_uxmloff)) $(eval $(call gb_CppunitTest_use_ure,xmloff_uxmloff)) |