[Libreoffice-commits] core.git: vcl/Module_vcl.mk

[Stephan Bergmann]

 vcl/Module_vcl.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a037f6338c19e16bcbc0674214666a786872c59d
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Aug 30 16:20:11 2016 +0200

    Disable CppunitTest_vcl_wmf_test under --enable-merglibs for now
    
    ...the problems caused by that test having the vcl objects linked into both the
    test's library and the mergedlib (which the test's library links against) are
    just not manageable.
    
    Change-Id: I6976407275f1f8d8cebfe2dfc6c09656a3936200

diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk
index 19f9f76..b1ef05d 100644
--- a/vcl/Module_vcl.mk
+++ b/vcl/Module_vcl.mk
@@ -107,7 +107,7 @@ $(eval $(call gb_Module_add_check_targets,vcl,\
 	CppunitTest_vcl_mapmode \
 	CppunitTest_vcl_outdev \
 	CppunitTest_vcl_app_test \
-	CppunitTest_vcl_wmf_test \
+	$(if $(MERGELIBS),,CppunitTest_vcl_wmf_test) \
 ))