diff options
| author | Kohei Yoshida <kyoshida@novell.com> | 2011-05-09 23:47:24 -0400 |
|---|---|---|
| committer | Kohei Yoshida <kyoshida@novell.com> | 2011-05-09 23:47:24 -0400 |
| commit | eac91db8a23223e456fb2f17e13e2cc328b2b7cf (patch) | |
| tree | ccd4fa51769a489c85f423765b1a7eab9d46c47d /sc/CppunitTest_sc_ucalc.mk | |
| parent | 9b9f11dfe23a3ec947725d6efb837d3783f1ddb5 (diff) | |
| parent | 1250574d40dd657188006d9efafbf28c27275f6c (diff) | |
Merge branch 'libreoffice-3-4'
Conflicts:
sc/CppunitTest_sc_ucalc.mk
sc/Module_sc.mk
sc/qa/unit/ucalc.cxx
sc/source/core/tool/dbcolect.cxx
sc/source/filter/excel/excimp8.cxx
sc/source/filter/inc/excimp8.hxx
sc/source/ui/docshell/impex.cxx
sc/source/ui/unoobj/datauno.cxx
Diffstat (limited to 'sc/CppunitTest_sc_ucalc.mk')
| -rw-r--r-- | sc/CppunitTest_sc_ucalc.mk | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/sc/CppunitTest_sc_ucalc.mk b/sc/CppunitTest_sc_ucalc.mk index ec8db65901f8..d58b8bdc0b6d 100644 --- a/sc/CppunitTest_sc_ucalc.mk +++ b/sc/CppunitTest_sc_ucalc.mk @@ -30,10 +30,23 @@ $(eval $(call gb_CppunitTest_CppunitTest,sc_ucalc)) +$(eval $(call gb_CppunitTest_add_package_headers,sc_ucalc,sc_qa_unit)) + $(eval $(call gb_CppunitTest_add_exception_objects,sc_ucalc, \ sc/qa/unit/ucalc \ )) +$(eval $(call gb_CppunitTest_set_args,sc_ucalc,\ + --headless \ + --invisible \ + "-env:UNO_TYPES=$(foreach binrdb,udkapi.rdb types.rdb,\ + file://$(if $(filter WNT,$(OS)),/)$(OUTDIR)/bin/$(binrdb))" \ + "-env:UNO_SERVICES=$(foreach rdb,$(OUTDIR)/xml/ure/services.rdb $(WORKDIR)/CustomTarget/sc/qa/unit/services.rdb,\ + file://$(if $(filter WNT,$(OS)),/)$(rdb))" \ + $(foreach dir,URE_INTERNAL_LIB_DIR OOO_BASE_DIR BRAND_BASE_DIR, \ + -env:$(dir)=file://$(if $(filter WNT,$(OS)),/$(OUTDIR)/bin,$(OUTDIR)/lib)) \ +)) + $(eval $(call gb_CppunitTest_add_library_objects,sc_ucalc,sc)) $(eval $(call gb_CppunitTest_add_linked_libs,sc_ucalc, \ |