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

[Libreoffice Gerrit user]

 solenv/gbuild/CppunitTest.mk |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit bce85c2605431bf2203bede5c039e9599b2e39f4
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Thu Oct 4 15:30:57 2018 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Thu Oct 4 21:40:40 2018 +0200

    Missing CppunitTest dependencies on new macOS/Windows vclplug backends
    
    ...after 1698debed2993fc5f262aa3ebbdb32fc112ac556 "Implement Windows VCL backend
    as plugin" and 3af4e1a0825c5b11ae4ef58fc411378aab669387 "Implement MacOSX VCL
    backend as plugin".  (On these platforms, the tests apparently call into the
    respective vclplug backend code regardless of whether the test is "headless" or
    not.)
    
    Change-Id: I6d93eacd9f94047add94ba3e866e6be1eb35c879
    Reviewed-on: https://gerrit.libreoffice.org/61376
    Reviewed-by: Jan-Marek Glogowski <glogow at fbihome.de>
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index 33dcd09abd9f..23d72de5716c 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -236,6 +236,10 @@ $(call gb_CppunitTest_get_target,$(1)) : $(if $(filter $(2),$(true)),, \
         $(if $(ENABLE_KDE4),$(call gb_Library_get_target,vclplug_kde4)) \
         $(if $(ENABLE_QT5),$(call gb_Library_get_target,vclplug_qt5)) \
 	 )
+else ifeq ($(OS),MACOSX)
+$(call gb_CppunitTest_get_target,$(1)): $(call gb_Library_get_target,vclplug_osx)
+else ifeq ($(OS),WNT)
+$(call gb_CppunitTest_get_target,$(1)): $(call gb_Library_get_target,vclplug_win)
 endif
 
 endef