diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-06-12 13:49:45 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-06-12 13:49:45 +0200 |
| commit | 798f410a94fb6b59610def117199c9d3e8e87d90 (patch) | |
| tree | a2d013bf47735e8e6dcdabac8b586bc16b8a7024 /solenv | |
| parent | eaf7e4f1b2486f95d9223576ebdf529c17e1861a (diff) | |
Fix vclplug_* dependencies for gb_CppunitTest_use_vcl
...and replace gb_CppunitTest_unset_headless with
gb_CppunitTest_use_vcl_non_headless.
Change-Id: Ibd859f98ed8df09988ca26ffcee26e06e25d8313
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/CppunitTest.mk | 30 |
1 files changed, 24 insertions, 6 deletions
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk index c442601bd84c..622e16d722c5 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) |