diff options
| author | Noel Grandin <noel@peralex.com> | 2014-11-12 16:31:09 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2014-11-13 10:55:21 +0000 |
| commit | 3adad743e7702a5403927c89d2d19534509c7085 (patch) | |
| tree | 5fc50e5e96c4eddafde1a1ca48c630b9f9e02366 /connectivity | |
| parent | 3150ae30415c1253258829dd3d39c015e75c6171 (diff) | |
fix connectivity unit test for --enable-mergedlibs
it's a workaround, but given the conflicting requirements of
MSVC not liking duplicate symbols, but the unit test needing to
link the objects directly to access internal symbols, there is
not much else we can do.
Change-Id: I9bdcc5f2b6ab0712cc3317033c4fbae4791cbb6b
Reviewed-on: https://gerrit.libreoffice.org/12387
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'connectivity')
| -rw-r--r-- | connectivity/CppunitTest_connectivity_commontools.mk | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/connectivity/CppunitTest_connectivity_commontools.mk b/connectivity/CppunitTest_connectivity_commontools.mk index e1c899ee1780..e9d6e9859840 100644 --- a/connectivity/CppunitTest_connectivity_commontools.mk +++ b/connectivity/CppunitTest_connectivity_commontools.mk @@ -35,6 +35,16 @@ $(eval $(call gb_CppunitTest_add_defs,connectivity_commontools,\ )) endif +# In mergedlibs mode we have multiply-defined symbols, which Visual Studio +# does not like. There is no good solution, so just force it. +ifeq ($(COM),MSC) +ifeq ($(MERGELIBS),CORE) +$(eval $(call gb_CppunitTest_add_ldflags,connectivity_commontools,\ + /FORCE:MULTIPLE \ +)) +endif +endif + $(eval $(call gb_CppunitTest_add_exception_objects,connectivity_commontools, \ connectivity/qa/connectivity/commontools/FValue_test \ )) |