diff options
| author | Matúš Kukan <matus.kukan@collabora.com> | 2014-03-18 11:20:49 +0100 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@collabora.com> | 2014-03-18 11:42:02 +0100 |
| commit | d145f49ba8cdf4a9c2e6b28f0f4468a95fc3575b (patch) | |
| tree | 8b6efe065928badac437a97ee3c074e24d5d2ce8 /xmloff/Module_xmloff.mk | |
| parent | 10faccaec6bffac6eec7159c8897c21a1d1c6d66 (diff) | |
Disable unit tests which use library objects from libmerged on Windows.
For some reason on Windows the linking fails with 'one or more multiply
defined symbols found' error.
Change-Id: If2af0822a837665e8f0a31d04cd42bf4d1f054f0
Diffstat (limited to 'xmloff/Module_xmloff.mk')
| -rw-r--r-- | xmloff/Module_xmloff.mk | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/xmloff/Module_xmloff.mk b/xmloff/Module_xmloff.mk index 6d0b59a8f7ff..93b9c9ba9f80 100644 --- a/xmloff/Module_xmloff.mk +++ b/xmloff/Module_xmloff.mk @@ -26,14 +26,12 @@ $(eval $(call gb_Module_add_targets,xmloff,\ )) $(eval $(call gb_Module_add_check_targets,xmloff,\ - CppunitTest_xmloff_uxmloff \ + $(if $(and $(filter $(COM),MSC),$(MERGELIBS)),, \ + CppunitTest_xmloff_uxmloff) \ )) $(eval $(call gb_Module_add_subsequentcheck_targets,xmloff,\ JunitTest_xmloff_unoapi \ )) -#todo: map file -#todo: xmlkywd.lib - built, but never used?! - # vim: set noet sw=4 ts=4: |