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 | |
| 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>
| -rw-r--r-- | Repository.mk | 1 | ||||
| -rw-r--r-- | configure.ac | 11 | ||||
| -rw-r--r-- | vcl/Library_vcl.mk | 6 | ||||
| -rw-r--r-- | vcl/Module_vcl.mk | 6 |
4 files changed, 18 insertions, 6 deletions
diff --git a/Repository.mk b/Repository.mk index 2a66608621a5..e8e5af6e81f8 100644 --- a/Repository.mk +++ b/Repository.mk @@ -312,6 +312,7 @@ endif ifeq ($(OS),HAIKU) $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,haiku, \ $(if $(ENABLE_QT5),vclplug_qt5) \ + $(if $(ENABLE_KDE5),vclplug_kde5) \ )) endif diff --git a/configure.ac b/configure.ac index e45a312672fd..cdc5322c460e 100644 --- a/configure.ac +++ b/configure.ac @@ -4646,6 +4646,7 @@ fi if test "$OS" = "HAIKU"; then enable_cairo_canvas=yes test_qt5=yes + test_kde5=yes fi dnl =================================================================== @@ -11150,8 +11151,14 @@ if test \( "$test_kde5" = "yes" -a "$ENABLE_KDE5" = "TRUE" \) -o \ \( "$test_kf5" = "yes" -a "$ENABLE_KF5" = "TRUE" \) -o \ \( "$test_gtk3_kde5" = "yes" -a "$ENABLE_GTK3_KDE5" = "TRUE" \) then - kf5_incdirs="$KF5INC /usr/include/ $x_includes" - kf5_libdirs="$KF5LIB /usr/lib /usr/lib/kf5 /usr/lib/kf5/devel $x_libraries" + if test "$OS" = "HAIKU"; then + haiku_arch="`echo $RTL_ARCH | tr X x`" + kf5_haiku_incdirs="`findpaths -c ' ' -a $haiku_arch B_FIND_PATH_HEADERS_DIRECTORY`" + kf5_haiku_libdirs="`findpaths -c ' ' -a $haiku_arch B_FIND_PATH_DEVELOP_LIB_DIRECTORY`" + fi + + kf5_incdirs="$KF5INC /usr/include/ $kf5_haiku_incdirs $x_includes" + kf5_libdirs="$KF5LIB /usr/lib /usr/lib/kf5 /usr/lib/kf5/devel $kf5_haiku_libdirs $x_libraries" if test -n "$supports_multilib"; then kf5_libdirs="$kf5_libdirs /usr/lib64 /usr/lib64/kf5 /usr/lib64/kf5/devel" fi 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),) |