odk/CppunitTest_odk_checkapi.mk | 7 +++++++
odk/Package_odk_headers.mk | 7 ++++++-
2 files changed, 13 insertions(+), 1 deletion(-)
New commits:
commit eb3ba1bb539815e39533a9d2f604527f1e5dcd15
Author: Hossein <hoss...@libreoffice.org>
AuthorDate: Thu Jun 27 09:55:06 2024 +0100
Commit: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
CommitDate: Wed Jul 24 13:01:34 2024 +0200
tdf#149256 Ship LibreOfficeKit headers in packages
Add LibreOfficeKitGtk.h
Change-Id: Ia575b9b9cb46ce4225d9030bf01453c5b3359325
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/169623
Tested-by: Jenkins
Reviewed-by: Hossein <hoss...@libreoffice.org>
Tested-by: Hossein <hoss...@libreoffice.org>
(cherry picked from commit b7a5d0e5669863033156ef15190c9fd509c45fa3)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/170879
Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
diff --git a/odk/CppunitTest_odk_checkapi.mk b/odk/CppunitTest_odk_checkapi.mk
index 1c93be6a2473..e27879d91e1f 100644
--- a/odk/CppunitTest_odk_checkapi.mk
+++ b/odk/CppunitTest_odk_checkapi.mk
@@ -15,6 +15,7 @@ $(eval $(call
gb_CppunitTest_add_exception_objects,odk_checkapi,\
$(eval $(call gb_CppunitTest_add_cxxflags,odk_checkapi,\
$(gb_CXX03FLAGS) \
+ $(if $(ENABLE_GTK3),$(GTK3_CFLAGS)) \
))
$(eval $(call gb_CppunitTest_set_external_code,odk_checkapi))
diff --git a/odk/Package_odk_headers.mk b/odk/Package_odk_headers.mk
index f4f7d9ba3a73..c103c23d4b27 100644
--- a/odk/Package_odk_headers.mk
+++ b/odk/Package_odk_headers.mk
@@ -1,4 +1,3 @@
-
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#
# This file is part of the LibreOffice project.
@@ -185,6 +184,7 @@ $(eval $(call
gb_Package_add_files_with_dir,odk_headers,$(SDKDIRNAME)/include,\
uno/mapping.hxx \
uno/sequence2.h \
uno/threadpool.h \
+ $(if $(ENABLE_GTK3),LibreOfficeKit/LibreOfficeKitGtk.h) \
LibreOfficeKit/LibreOfficeKit.hxx \
LibreOfficeKit/LibreOfficeKitEnums.h \
LibreOfficeKit/LibreOfficeKit.h \
commit f41c106764cfed80c31d13a49ad879491eaad738
Author: Hossein <hoss...@libreoffice.org>
AuthorDate: Tue Jan 9 10:55:01 2024 +0000
Commit: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
CommitDate: Wed Jul 24 13:01:25 2024 +0200
tdf#149256 Ship LibreOfficeKit headers in packages
With LibreOfficeKit (LOK) headers in place, it would be possible to
create C++ applications that can access LibreOffice functionality
without building LibreOffice, only by installing SDK and build tools.
Change-Id: I8efc8ac1cec7b3b89e4d7eb2c8d15afeb595672c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134863
Tested-by: Hossein <hoss...@libreoffice.org>
Tested-by: Jenkins
Reviewed-by: Hossein <hoss...@libreoffice.org>
(cherry picked from commit 1305edfbc27121d7fc8973ccafb92f76d5401ac1)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/170548
Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
diff --git a/odk/CppunitTest_odk_checkapi.mk b/odk/CppunitTest_odk_checkapi.mk
index 22dad8cab62a..1c93be6a2473 100644
--- a/odk/CppunitTest_odk_checkapi.mk
+++ b/odk/CppunitTest_odk_checkapi.mk
@@ -28,6 +28,12 @@ $(eval $(call gb_CppunitTest_set_external_code,odk_checkapi))
$(eval $(call gb_CppunitTest_set_include,odk_checkapi, \
-I$(INSTDIR)/$(SDKDIRNAME)/include $(SOLARINC)))
+ifeq ($(OS),LINUX)
+$(eval $(call gb_CppunitTest_add_libs,odk_checkapi,\
+ -ldl \
+))
+endif
+
$(eval $(call gb_CppunitTest_use_custom_headers,odk_checkapi,\
odk/allheaders \
))
diff --git a/odk/Package_odk_headers.mk b/odk/Package_odk_headers.mk
index cc52b9719f9a..f4f7d9ba3a73 100644
--- a/odk/Package_odk_headers.mk
+++ b/odk/Package_odk_headers.mk
@@ -185,6 +185,11 @@ $(eval $(call
gb_Package_add_files_with_dir,odk_headers,$(SDKDIRNAME)/include,\
uno/mapping.hxx \
uno/sequence2.h \
uno/threadpool.h \
+ LibreOfficeKit/LibreOfficeKit.hxx \
+ LibreOfficeKit/LibreOfficeKitEnums.h \
+ LibreOfficeKit/LibreOfficeKit.h \
+ LibreOfficeKit/LibreOfficeKitInit.h \
+ LibreOfficeKit/LibreOfficeKitTypes.h \
))
# vim: set noet sw=4 ts=4:
