diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2012-03-10 16:43:41 +0100 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2012-03-10 21:23:23 +0100 |
| commit | c289ee218fb39813298c540c715378a762f66692 (patch) | |
| tree | 51469d5381175e006f6cfd69921c19bd64f99261 | |
| parent | bf5380c24037ddd2eff028bea9e5460a266100f8 (diff) | |
sdext: fix unit test for Windows
| -rw-r--r-- | sdext/CppunitTest_pdfimport.mk | 3 | ||||
| -rw-r--r-- | solenv/gbuild/CppunitTest.mk | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/sdext/CppunitTest_pdfimport.mk b/sdext/CppunitTest_pdfimport.mk index bbda2d544960..77a0d2ae0107 100644 --- a/sdext/CppunitTest_pdfimport.mk +++ b/sdext/CppunitTest_pdfimport.mk @@ -28,7 +28,8 @@ $(eval $(call gb_CppunitTest_CppunitTest,sdext_pdfimport)) $(eval $(call gb_CppunitTest_add_defs,sdext_pdfimport,\ - -DPDFIMPORT_EXECUTABLE_LOCATION=\"file://$(dir $(call gb_Executable_get_target,xpdfimport))\" \ + -DPDFIMPORT_EXECUTABLE_LOCATION=\"$(call gb_CppunitTarget__make_url,\ + $(dir $(call gb_Executable_get_target,xpdfimport)))\" \ )) $(eval $(call gb_CppunitTest_add_api,sdext_pdfimport,\ diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk index 9a5adcf903e6..ff6d30068d16 100644 --- a/solenv/gbuild/CppunitTest.mk +++ b/solenv/gbuild/CppunitTest.mk @@ -58,7 +58,7 @@ endif gb_CppunitTest__get_linktargetname = CppunitTest/$(call gb_CppunitTest_get_filename,$(1)) # TODO: move this to platform under suitable name -gb_CppunitTarget__make_url = file://$(if $(filter WNT,$(OS_FOR_BUILD)),/)$(1) +gb_CppunitTarget__make_url = file://$(if $(filter WNT,$(OS_FOR_BUILD)),/)$(strip $(1)) gb_CppunitTest__get_uno_type_target = $(OUTDIR)/bin/$(1).rdb define gb_CppunitTest__make_args |