[Libreoffice-commits] core.git: desktop/Module_desktop.mk

[Miklos Vajna]

 desktop/Module_desktop.mk |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit ac882c305da2c5d9c30756da8ac2976f9047622d
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Thu Sep 10 09:38:02 2015 +0200

    desktop: enable CppunitTest_desktop_lib only on Linux
    
    Since the test would fail to link on Windows, due to
    
    ifeq ($(GUIBASE),unx)
    $(eval $(call gb_Library_add_exception_objects,sofficeapp,\
        desktop/source/lib/init \
    ))
    endif
    
    in Library_sofficeapp.mk. Given that
    CppunitTest_libreofficekit_tiledrendering is marked as Linux-only as
    well, be consistent and have this test as Linux-only, too.
    
    Change-Id: I6c8884398eba5dcf8a74c9cdc96c869b6108fb7e

diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk
index c725a26..d74d406 100644
--- a/desktop/Module_desktop.mk
+++ b/desktop/Module_desktop.mk
@@ -130,8 +130,10 @@ $(eval $(call gb_Module_add_check_targets,desktop, \
     CppunitTest_desktop_version \
 ))
 
+ifeq ($(OS),LINUX)
 $(eval $(call gb_Module_add_check_targets,desktop, \
     CppunitTest_desktop_lib \
 ))
+endif
 
 # vim: set ts=4 sw=4 et: