|
 |
f325b2 |
From a72e78faa93c71cce4f479a99f4b6b9961a3968d Mon Sep 17 00:00:00 2001
|
|
|
f325b2 |
From: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
|
f325b2 |
Date: Thu, 10 Sep 2015 09:38:02 +0200
|
|
|
f325b2 |
Subject: [PATCH 104/398] desktop: enable CppunitTest_desktop_lib only on Linux
|
|
|
f325b2 |
|
|
|
f325b2 |
Since the test would fail to link on Windows, due to
|
|
|
f325b2 |
|
|
|
f325b2 |
ifeq ($(GUIBASE),unx)
|
|
|
f325b2 |
$(eval $(call gb_Library_add_exception_objects,sofficeapp,\
|
|
|
f325b2 |
desktop/source/lib/init \
|
|
|
f325b2 |
))
|
|
|
f325b2 |
endif
|
|
|
f325b2 |
|
|
|
f325b2 |
in Library_sofficeapp.mk. Given that
|
|
|
f325b2 |
CppunitTest_libreofficekit_tiledrendering is marked as Linux-only as
|
|
|
f325b2 |
well, be consistent and have this test as Linux-only, too.
|
|
|
f325b2 |
|
|
|
f325b2 |
Change-Id: I6c8884398eba5dcf8a74c9cdc96c869b6108fb7e
|
|
|
f325b2 |
(cherry picked from commit ac882c305da2c5d9c30756da8ac2976f9047622d)
|
|
|
f325b2 |
---
|
|
|
f325b2 |
desktop/Module_desktop.mk | 2 ++
|
|
|
f325b2 |
1 file changed, 2 insertions(+)
|
|
|
f325b2 |
|
|
|
f325b2 |
diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk
|
|
|
f325b2 |
index c725a268721e..d74d40629a28 100644
|
|
|
f325b2 |
--- a/desktop/Module_desktop.mk
|
|
|
f325b2 |
+++ b/desktop/Module_desktop.mk
|
|
|
f325b2 |
@@ -130,8 +130,10 @@ $(eval $(call gb_Module_add_check_targets,desktop, \
|
|
|
f325b2 |
CppunitTest_desktop_version \
|
|
|
f325b2 |
))
|
|
|
f325b2 |
|
|
|
f325b2 |
+ifeq ($(OS),LINUX)
|
|
|
f325b2 |
$(eval $(call gb_Module_add_check_targets,desktop, \
|
|
|
f325b2 |
CppunitTest_desktop_lib \
|
|
|
f325b2 |
))
|
|
|
f325b2 |
+endif
|
|
|
f325b2 |
|
|
|
f325b2 |
# vim: set ts=4 sw=4 et:
|
|
|
f325b2 |
--
|
|
|
f325b2 |
2.12.0
|
|
|
f325b2 |
|