diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2024-02-20 11:31:12 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2024-02-20 12:34:34 +0100 |
| commit | 6361a9398584defe9ab8db1e3383e02912e3f24c (patch) | |
| tree | 8690f521e9ae02f53048b2b770fa9dbaba781e50 /solenv/gbuild | |
| parent | 864e752d9e876d29c54aba3b8fd57e4f71a02955 (diff) | |
merge desktop_detector library into vcl library
Noting that the main feature of using a separate library - avoiding
linking against SM and ICE - is no longer a thing, since we have not
used those in some time.
Change-Id: I9ecd6758e97f0fa19b224346aa577a04b46793b8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163638
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'solenv/gbuild')
| -rw-r--r-- | solenv/gbuild/CppunitTest.mk | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk index adfcccce49fb..fc7351986b09 100644 --- a/solenv/gbuild/CppunitTest.mk +++ b/solenv/gbuild/CppunitTest.mk @@ -242,7 +242,6 @@ 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 ($(USING_X11),TRUE) -$(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_gen) \ $(if $(ENABLE_GTK3),$(call gb_Library_get_target,vclplug_gtk3)) \ |