cppcanvas/CppunitTest_cppcanvas_emfplus.mk | 4 ---
solenv/gbuild/CppunitTest.mk | 30 +++++++++++++++++++++++------
test/Library_subsequenttest.mk | 7 ------
test/Library_test.mk | 7 ------
4 files changed, 25 insertions(+), 23 deletions(-)
New commits:
commit 798f410a94fb6b59610def117199c9d3e8e87d90
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Thu Jun 12 13:49:45 2014 +0200
Fix vclplug_* dependencies for gb_CppunitTest_use_vcl
...and replace gb_CppunitTest_unset_headless with
gb_CppunitTest_use_vcl_non_headless.
Change-Id: Ibd859f98ed8df09988ca26ffcee26e06e25d8313
diff --git a/cppcanvas/CppunitTest_cppcanvas_emfplus.mk
b/cppcanvas/CppunitTest_cppcanvas_emfplus.mk
index 8cd1506..951c37c 100644
--- a/cppcanvas/CppunitTest_cppcanvas_emfplus.mk
+++ b/cppcanvas/CppunitTest_cppcanvas_emfplus.mk
@@ -26,8 +26,6 @@ $(eval $(call gb_CppunitTest_use_libraries,cppcanvas_emfplus,
\
vcl \
))
-$(eval $(call gb_CppunitTest_unset_headless,cppcanvas_emfplus))
-
$(eval $(call gb_CppunitTest_use_external,cppcanvas_emfplus,boost_headers))
$(eval $(call gb_CppunitTest_use_api,cppcanvas_emfplus,\
@@ -36,7 +34,7 @@ $(eval $(call gb_CppunitTest_use_api,cppcanvas_emfplus,\
))
$(eval $(call gb_CppunitTest_use_ure,cppcanvas_emfplus))
-$(eval $(call gb_CppunitTest_use_vcl,cppcanvas_emfplus))
+$(eval $(call gb_CppunitTest_use_vcl_non_headless,cppcanvas_emfplus))
$(eval $(call gb_CppunitTest_use_components,cppcanvas_emfplus,\
canvas/source/cairo/cairocanvas \
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index c442601..622e16d 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -147,9 +147,32 @@ $(call gb_CppunitTest_get_target,$(1)) : $(call
gb_Library_get_target,unoexcepti
endef
-define gb_CppunitTest_use_vcl
+# $(2) == $(true) if headless:
+define gb_CppunitTest__use_vcl
$(call gb_CppunitTest_get_target,$(1)) : VCL := $(true)
$(call gb_CppunitTest_get_target,$(1)) : $(call
gb_Library_get_target,vclbootstrapprotector)
+ifeq ($(GUIBASE),unx)
+$(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_Library_get_target,vclplug_svp), \
+ $(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)) \
+ $(if $(ENABLE_KDE),$(call gb_Library_get_target,vclplug_kde)) \
+ $(if $(ENABLE_KDE4),$(call gb_Library_get_target,vclplug_kde4)) \
+ $(if $(ENABLE_TDE),$(call gb_Library_get_target,vclplug_tde)))
+endif
+
+endef
+
+define gb_CppunitTest_use_vcl
+$(call gb_CppunitTest__use_vcl,$(1),$(true))
+
+endef
+
+define gb_CppunitTest_use_vcl_non_headless
+$(call gb_CppunitTest_get_target,$(1)) : HEADLESS :=
+$(call gb_CppunitTest__use_vcl,$(1),$(false))
endef
@@ -225,11 +248,6 @@ $(call
gb_CppunitTest__use_configuration,$(1),xcsxcu,$(INSTROOT)/$(LIBO_SHARE_FO
endef
-define gb_CppunitTest_unset_headless
-$(call gb_CppunitTest_get_target,$(1)) : HEADLESS=
-
-endef
-
# Use configuration in $(WORKDIR)/unittest/registry.
define gb_CppunitTest_use_unittest_configuration
$(call gb_CppunitTest_get_target,$(1)) : $(call
gb_Package_get_target,test_unittest)
diff --git a/test/Library_subsequenttest.mk b/test/Library_subsequenttest.mk
index 80a855d..09f6c3e 100644
--- a/test/Library_subsequenttest.mk
+++ b/test/Library_subsequenttest.mk
@@ -29,13 +29,6 @@ $(eval $(call gb_Library_use_libraries,subsequenttest,\
$(gb_UWINAPI) \
))
-ifeq ($(GUIBASE),unx)
-$(call gb_Library_get_target,subsequenttest) : \
- $(call gb_Library_get_target,desktop_detector) \
- $(call gb_Library_get_target,vclplug_svp) \
-
-endif
-
$(eval $(call gb_Library_use_externals,subsequenttest,\
boost_headers \
cppunit \
diff --git a/test/Library_test.mk b/test/Library_test.mk
index a9f91c9..585c7eb 100644
--- a/test/Library_test.mk
+++ b/test/Library_test.mk
@@ -35,13 +35,6 @@ $(eval $(call gb_Library_use_libraries,test,\
$(gb_UWINAPI) \
))
-ifeq ($(GUIBASE),unx)
-$(call gb_Library_get_target,test) : \
- $(call gb_Library_get_target,desktop_detector) \
- $(call gb_Library_get_target,vclplug_svp) \
-
-endif
-
$(eval $(call gb_Library_add_exception_objects,test,\
test/source/bootstrapfixture \
test/source/diff/diff \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
