[Libreoffice-commits] core.git: connectivity/CppunitTest_connectivity_commontools.mk

[Noel Grandin]

 connectivity/CppunitTest_connectivity_commontools.mk |   10 ++++++++++
 1 file changed, 10 insertions(+)

New commits:
commit 3adad743e7702a5403927c89d2d19534509c7085
Author: Noel Grandin <noel at peralex.com>
Date:   Wed Nov 12 16:31:09 2014 +0200

    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 at gmail.com>
    Tested-by: Noel Grandin <noelgrandin at gmail.com>

diff --git a/connectivity/CppunitTest_connectivity_commontools.mk b/connectivity/CppunitTest_connectivity_commontools.mk
index e1c899e..e9d6e98 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 \
 ))