diff options
| author | Kacper Kasper <kacperkasper@gmail.com> | 2018-06-10 03:51:57 +0200 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2018-06-21 17:44:30 +0200 |
| commit | 8ef359b89c8970ed8d4c9afbe63c4f84ac0318a1 (patch) | |
| tree | 2fdfd9af5fb13ce11daf9679c13979a16676694b /vcl | |
| parent | 33e223d07da289a25cbb2e0a06bd58ffde8d7c0b (diff) | |
Allow building KDE5 backend on Haiku
Change-Id: I3138d26596af4c615fe2caaa2b160a76d8d2a352
Reviewed-on: https://gerrit.libreoffice.org/55548
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/Library_vcl.mk | 6 | ||||
| -rw-r--r-- | vcl/Module_vcl.mk | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index f01302fd1080..ea2b6fac2aee 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -676,11 +676,9 @@ $(eval $(call gb_Library_add_libs,vcl,\ -lbe \ )) -ifeq ($(ENABLE_QT5),TRUE) -$(eval $(call gb_Library_add_exception_objects,vcl,\ - vcl/unx/generic/plugadapt/salplug \ +$(eval $(call gb_Library_add_exception_objects,vcl, \ + $(if $(or $(ENABLE_QT5),$(ENABLE_KDE5)),vcl/unx/generic/plugadapt/salplug) \ )) -endif $(eval $(call gb_Library_use_externals,vcl,\ cairo \ diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk index f2dfff71d862..0fc88c18c26f 100644 --- a/vcl/Module_vcl.mk +++ b/vcl/Module_vcl.mk @@ -122,6 +122,12 @@ $(eval $(call gb_Module_add_targets,vcl,\ Library_vclplug_qt5 \ )) endif +ifneq ($(ENABLE_KDE5),) +$(eval $(call gb_Module_add_targets,vcl,\ + CustomTarget_kde5_moc \ + Library_vclplug_kde5 \ +)) +endif endif ifneq ($(ENABLE_FUZZERS),) |