diff options
| author | Vincent Richard <[email protected]> | 2013-03-01 12:16:25 +0000 |
|---|---|---|
| committer | Vincent Richard <[email protected]> | 2013-03-01 12:16:25 +0000 |
| commit | 34fe74f8d01cbbc2fbe4046a475a9e8049582fd9 (patch) | |
| tree | 3e2ad3890dca00fbbaf4ed02342da24d4bdb76d4 | |
| parent | Fixed dependencies and generation of .pc file (issue #28). (diff) | |
| download | vmime-34fe74f8d01cbbc2fbe4046a475a9e8049582fd9.tar.gz vmime-34fe74f8d01cbbc2fbe4046a475a9e8049582fd9.zip | |
More fixes for pkg-config.
| -rw-r--r-- | CMakeLists.txt | 8 | ||||
| -rw-r--r-- | libvmime.pc.in | 3 |
2 files changed, 6 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 42c1539a..3143ce36 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -479,7 +479,7 @@ IF(VMIME_HAVE_SASL_SUPPORT) ENDIF() SET(VMIME_PKGCONFIG_LIBS "${VMIME_PKGCONFIG_LIBS} ${GSASL_LIBRARIES}") - SET(VMIME_PKGCONFIG_CFLAGS "${VMIME_PKGCONFIG_CFLAGS} ${GSASL_INCLUDE_DIR}") + SET(VMIME_PKGCONFIG_CFLAGS "${VMIME_PKGCONFIG_CFLAGS} -I${GSASL_INCLUDE_DIR}") SET(VMIME_PKGCONFIG_REQUIRES "${VMIME_PKGCONFIG_REQUIRES} libgsasl") ENDIF() @@ -536,7 +536,7 @@ IF(VMIME_HAVE_TLS_SUPPORT) ENDIF() SET(VMIME_PKGCONFIG_LIBS "${VMIME_PKGCONFIG_LIBS} ${GNUTLS_LIBRARY_DIRS} ${GNUTLS_LIBRARY}") - SET(VMIME_PKGCONFIG_CFLAGS "${VMIME_PKGCONFIG_CFLAGS} ${GNUTLS_INCLUDE_DIR}") + SET(VMIME_PKGCONFIG_CFLAGS "${VMIME_PKGCONFIG_CFLAGS} -I${GNUTLS_INCLUDE_DIR}") SET(VMIME_PKGCONFIG_REQUIRES "${VMIME_PKGCONFIG_REQUIRES} gnutls") ELSEIF(VMIME_TLS_SUPPORT_LIB_IS_OPENSSL) @@ -555,7 +555,7 @@ IF(VMIME_HAVE_TLS_SUPPORT) ENDIF() SET(VMIME_PKGCONFIG_LIBS "${VMIME_PKGCONFIG_LIBS} ${OPENSSL_LIBRARIES}") - SET(VMIME_PKGCONFIG_CFLAGS "${VMIME_PKGCONFIG_CFLAGS} ${OPENSSL_INCLUDE_DIR}") + SET(VMIME_PKGCONFIG_CFLAGS "${VMIME_PKGCONFIG_CFLAGS} -I${OPENSSL_INCLUDE_DIR}") SET(VMIME_PKGCONFIG_REQUIRES "${VMIME_PKGCONFIG_REQUIRES} openssl") ELSE() @@ -586,7 +586,7 @@ IF(VMIME_BUILD_SHARED_LIBRARY) ENDIF() SET(VMIME_PKGCONFIG_LIBS "${VMIME_PKGCONFIG_LIBS} ${ICONV_LIBRARIES}") -SET(VMIME_PKGCONFIG_CFLAGS "${VMIME_PKGCONFIG_CFLAGS} ${ICONV_INCLUDE_DIR}") +SET(VMIME_PKGCONFIG_CFLAGS "${VMIME_PKGCONFIG_CFLAGS} -I${ICONV_INCLUDE_DIR}") ############################################################################## diff --git a/libvmime.pc.in b/libvmime.pc.in index ce924a8d..fc1103ef 100644 --- a/libvmime.pc.in +++ b/libvmime.pc.in @@ -7,6 +7,7 @@ Name: @VMIME_PACKAGE_NAME@ Description: @VMIME_PACKAGE_DESCRIPTION@ Version: @VMIME_PACKAGE_VERSION@ Requires.private: @VMIME_PKGCONFIG_REQUIRES@ -Libs.private: -L${libdir} -l@VMIME_LIBRARY_NAME@ @VMIME_PKGCONFIG_LIBS@ +Libs: -L${libdir} -l@VMIME_LIBRARY_NAME@ +Libs.private: @VMIME_PKGCONFIG_LIBS@ Cflags: -I${includedir}/ @VMIME_PKGCONFIG_CFLAGS@ |