[Pkg-gnupg-commit] [gpgme] 43/412: Add additional include path in config files

Daniel Kahn Gillmor dkg at fifthhorseman.net
Thu Sep 22 21:26:11 UTC 2016


This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch master
in repository gpgme.

commit 63c115b067400e1b02c7d849c99f54dc9f394d68
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Sat Apr 2 09:14:10 2016 -0800

    Add additional include path in config files
    
    * lang/cpp/src/GpgmeppConfig.cmake.in.in
     lang/qt/src/QGpgmeConfig.cmake.in.in: Include directory above headers.
    
    --
    This ensures that code using #inlcude <gpgme++/header.h> still works.
---
 lang/cpp/src/GpgmeppConfig.cmake.in.in | 2 +-
 lang/qt/src/QGpgmeConfig.cmake.in.in   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lang/cpp/src/GpgmeppConfig.cmake.in.in b/lang/cpp/src/GpgmeppConfig.cmake.in.in
index 51218c6..a61ba32 100644
--- a/lang/cpp/src/GpgmeppConfig.cmake.in.in
+++ b/lang/cpp/src/GpgmeppConfig.cmake.in.in
@@ -68,7 +68,7 @@ get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
 add_library(Gpgmepp SHARED IMPORTED)
 
 set_target_properties(Gpgmepp PROPERTIES
-  INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include/gpgme++"
+  INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include;${_IMPORT_PREFIX}/include/gpgme++"
   INTERFACE_LINK_LIBRARIES "@resolved_libdir@/libgpgme at libsuffix@;@LIBASSUAN_LIBS@;@GPG_ERROR_LIBS@"
   IMPORTED_LOCATION "@resolved_libdir@/libgpgmepp at libsuffix@"
 )
diff --git a/lang/qt/src/QGpgmeConfig.cmake.in.in b/lang/qt/src/QGpgmeConfig.cmake.in.in
index 36ee920..3d19696 100644
--- a/lang/qt/src/QGpgmeConfig.cmake.in.in
+++ b/lang/qt/src/QGpgmeConfig.cmake.in.in
@@ -68,7 +68,7 @@ get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
 add_library(QGpgme SHARED IMPORTED)
 
 set_target_properties(QGpgme PROPERTIES
-  INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include/qgpgme"
+  INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include;${_IMPORT_PREFIX}/include/qgpgme"
   INTERFACE_LINK_LIBRARIES "Gpgmepp;Qt5::Core"
   IMPORTED_LOCATION "@resolved_libdir@/libqgpgme at libsuffix@"
 )

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gpgme.git



More information about the Pkg-gnupg-commit mailing list