[Libreoffice-commits] core.git: solenv/gbuild

Stephan Bergmann sbergman at redhat.com
Mon Oct 5 02:41:35 PDT 2015


 solenv/gbuild/CppunitTest.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 153ac5dc8fd15efff49c7e428ac6a3799aded0f4
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Oct 5 11:39:44 2015 +0200

    Fix gb_CppunitTest__use_vcl dependencies
    
    Regression introduced with 41c66312885393614c274897fd75a25c2ddf6ba0 "The 'svp'
    'plug-in' library is empty so don't build it at all"
    
    Change-Id: I534173372ee21e16c78693f60957706bbf61c1c8

diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index b643598..15b5f8a22 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -174,7 +174,7 @@ $(call gb_CppunitTest_get_target,$(1)) : VCL := $(true)
 $(call gb_CppunitTest_get_target,$(1)) : $(call gb_Library_get_target,vclbootstrapprotector)
 ifeq ($(USING_X11),TRUE)
 $(call gb_CppunitTest_get_target,$(1)) : $(call gb_Library_get_target,desktop_detector)
-$(call gb_CppunitTest_get_target,$(1)) : $(if $(filter $(2),$(true)), \
+$(call gb_CppunitTest_get_target,$(1)) : $(if $(filter $(2),$(true)),, \
     $(call gb_Library_get_target,vclplug_gen) \
         $(if $(ENABLE_GTK),$(call gb_Library_get_target,vclplug_gtk)) \
         $(if $(ENABLE_GTK3),$(call gb_Library_get_target,vclplug_gtk3)) \


More information about the Libreoffice-commits mailing list