GpgFrontend/vmime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More fixes for pkg-config.

Browse Source
This commit is contained in:
Vincent Richard 2013-03-01 13:16:25 +01:00
parent c414786c27
commit 34fe74f8d0
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -479,7 +479,7 @@ IF(VMIME_HAVE_SASL_SUPPORT)
ENDIF() ENDIF()
SET(VMIME_PKGCONFIG_LIBS "${VMIME_PKGCONFIG_LIBS} ${GSASL_LIBRARIES}") 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") SET(VMIME_PKGCONFIG_REQUIRES "${VMIME_PKGCONFIG_REQUIRES} libgsasl")
ENDIF() ENDIF()
@ -536,7 +536,7 @@ IF(VMIME_HAVE_TLS_SUPPORT)
ENDIF() ENDIF()
SET(VMIME_PKGCONFIG_LIBS "${VMIME_PKGCONFIG_LIBS} ${GNUTLS_LIBRARY_DIRS} ${GNUTLS_LIBRARY}") 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") SET(VMIME_PKGCONFIG_REQUIRES "${VMIME_PKGCONFIG_REQUIRES} gnutls")
ELSEIF(VMIME_TLS_SUPPORT_LIB_IS_OPENSSL) ELSEIF(VMIME_TLS_SUPPORT_LIB_IS_OPENSSL)
@ -555,7 +555,7 @@ IF(VMIME_HAVE_TLS_SUPPORT)
ENDIF() ENDIF()
SET(VMIME_PKGCONFIG_LIBS "${VMIME_PKGCONFIG_LIBS} ${OPENSSL_LIBRARIES}") 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") SET(VMIME_PKGCONFIG_REQUIRES "${VMIME_PKGCONFIG_REQUIRES} openssl")
ELSE() ELSE()
@ -586,7 +586,7 @@ IF(VMIME_BUILD_SHARED_LIBRARY)
ENDIF() ENDIF()
SET(VMIME_PKGCONFIG_LIBS "${VMIME_PKGCONFIG_LIBS} ${ICONV_LIBRARIES}") 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}")
############################################################################## ##############################################################################

3
libvmime.pc.in
View File

@ -7,6 +7,7 @@ Name: @VMIME_PACKAGE_NAME@
Description: @VMIME_PACKAGE_DESCRIPTION@ Description: @VMIME_PACKAGE_DESCRIPTION@
Version: @VMIME_PACKAGE_VERSION@ Version: @VMIME_PACKAGE_VERSION@
Requires.private: @VMIME_PKGCONFIG_REQUIRES@ 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@ Cflags: -I${includedir}/ @VMIME_PKGCONFIG_CFLAGS@