[Libreoffice-commits] core.git: RepositoryExternal.mk

Katarina Behrens Katarina.Behrens at cib.de
Thu Feb 16 12:52:18 UTC 2017


 RepositoryExternal.mk |   14 ++++++++++++++
 1 file changed, 14 insertions(+)

New commits:
commit 55519a18be63be5a6ce955784f0d326fc6cabf9d
Author: Katarina Behrens <Katarina.Behrens at cib.de>
Date:   Wed Feb 15 16:00:16 2017 +0100

    gpg4libre: gbuild funcs for building with internal gpgme(pp)
    
    Change-Id: I12b57b8925c263ec904549ea38a2c581f20b9d14
    Reviewed-on: https://gerrit.libreoffice.org/34301
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 3871080..d1b2416 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3405,6 +3405,20 @@ $(call gb_LinkTarget_add_libs,$(1),\
 
 endef
 
+else # NON-SYSTEM_GPGME
+
+define gb_LinkTarget__use_gpgme
+$(call gb_LinkTarget_set_include,$(1),\
+	-I$(call gb_UnpackedTarball_get_dir,gpgme)/lang/cpp/src \
+	$$(INCLUDE) \
+)
+$(call gb_LinkTarget_add_libs,$(1),\
+	$(call gb_UnpackedTarball_get_dir,gpgme)/lang/cpp/src/.libs/libgpgmepp$(gb_StaticLibrary_PLAINEXT)  \
+)
+$(call gb_LinkTarget_use_external_project,$(1),gpgme)
+
+endef
+
 endif
 
 ifeq ($(ENABLE_GLTF),TRUE)


More information about the Libreoffice-commits mailing list