diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-10-24 13:20:43 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-10-24 13:28:07 +0200 |
| commit | 04bc75a9b1d5e14c5ec863fd6d0c70d02d5d9da5 (patch) | |
| tree | 941c5b8b1de7b00abdae1f273f7d59081608add8 /svgio | |
| parent | 86bef9224e0f10bfc81bc87c0302d9cee0d33dd6 (diff) | |
Beware gb_CppunitTest_use_library_files plus gb_CppunitTest_use_component
...it causes the library's objects to be loaded twice, causing potential trouble
with static data. So introduce gb_Cppunit_set_componentfile, processing the
library's source component file into an additional workdir/CppuntiTest/
component file referencing the test library. (This required to drop the
gb_Helper_abbreviate_dirs bric-a-brac, as it would do $W replacement into file
URLs contained in the resulting .component file.)
Change-Id: I57847e549817d25cca53a13effd7d408e0c99f9a
Diffstat (limited to 'svgio')
| -rw-r--r-- | svgio/CppunitTest_svgio.mk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/svgio/CppunitTest_svgio.mk b/svgio/CppunitTest_svgio.mk index 2aa4f39b61c4..939842d4157f 100644 --- a/svgio/CppunitTest_svgio.mk +++ b/svgio/CppunitTest_svgio.mk @@ -9,6 +9,8 @@ $(eval $(call gb_CppunitTest_CppunitTest,svgio_import_test)) +$(eval $(call gb_CppunitTest_set_componentfile,svgio_import_test,svgio/svgio)) + $(eval $(call gb_CppunitTest_set_include,svgio_import_test,\ $$(INCLUDE) \ -I$(SRCDIR)/svgio/inc \ @@ -63,7 +65,6 @@ $(eval $(call gb_CppunitTest_use_components,svgio_import_test,\ ucb/source/core/ucb1 \ ucb/source/ucp/file/ucpfile1 \ unotools/util/utl \ - svgio/svgio \ sax/source/expatwrap/expwrap \ )) |