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

Fixed dependencies and generation of .pc file (issue #28).

Browse Source
This commit is contained in:
Vincent Richard 2013-03-01 12:25:20 +01:00
parent 18846c3691
commit c414786c27
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
CMakeLists.txt
View File

@ -300,9 +300,6 @@ IF(${WIN32})
SET(libdir ${CMAKE_INSTALL_PREFIX}/bin) SET(libdir ${CMAKE_INSTALL_PREFIX}/bin)
ENDIF(${WIN32}) ENDIF(${WIN32})
CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/libvmime.pc.in ${CMAKE_BINARY_DIR}/libvmime.pc @ONLY)
INSTALL(FILES ${CMAKE_BINARY_DIR}/libvmime.pc DESTINATION lib${LIB_SUFFIX}/pkgconfig COMPONENT headers)
############################################################################## ##############################################################################
# Build type # Build type
@ -540,7 +537,7 @@ IF(VMIME_HAVE_TLS_SUPPORT)
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} ${GNUTLS_INCLUDE_DIR}")
SET(VMIME_PKGCONFIG_REQUIRES "${VMIME_PKGCONFIG_REQUIRES} libgnutls") SET(VMIME_PKGCONFIG_REQUIRES "${VMIME_PKGCONFIG_REQUIRES} gnutls")
ELSEIF(VMIME_TLS_SUPPORT_LIB_IS_OPENSSL) ELSEIF(VMIME_TLS_SUPPORT_LIB_IS_OPENSSL)
@ -559,7 +556,7 @@ IF(VMIME_HAVE_TLS_SUPPORT)
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} ${OPENSSL_INCLUDE_DIR}")
SET(VMIME_PKGCONFIG_REQUIRES "${VMIME_PKGCONFIG_REQUIRES} libopenssl") SET(VMIME_PKGCONFIG_REQUIRES "${VMIME_PKGCONFIG_REQUIRES} openssl")
ELSE() ELSE()
@ -588,6 +585,9 @@ IF(VMIME_BUILD_SHARED_LIBRARY)
) )
ENDIF() ENDIF()
SET(VMIME_PKGCONFIG_LIBS "${VMIME_PKGCONFIG_LIBS} ${ICONV_LIBRARIES}")
SET(VMIME_PKGCONFIG_CFLAGS "${VMIME_PKGCONFIG_CFLAGS} ${ICONV_INCLUDE_DIR}")
############################################################################## ##############################################################################
# Platform # Platform
@ -767,5 +767,9 @@ ENDIF()
# Set our configure file # Set our configure file
CONFIGURE_FILE(cmake/config.hpp.cmake vmime/config.hpp) CONFIGURE_FILE(cmake/config.hpp.cmake vmime/config.hpp)
# PkgConfig post-configuration
CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/libvmime.pc.in ${CMAKE_BINARY_DIR}/libvmime.pc @ONLY)
INSTALL(FILES ${CMAKE_BINARY_DIR}/libvmime.pc DESTINATION lib${LIB_SUFFIX}/pkgconfig COMPONENT headers)
INCLUDE(CPack) INCLUDE(CPack)

6
libvmime.pc.in
View File

@ -3,10 +3,10 @@ exec_prefix=@exec_prefix@
libdir=@libdir@ libdir=@libdir@
includedir=@includedir@ includedir=@includedir@
Name: @VMIME_LIBRARY_NAME@ Name: @VMIME_PACKAGE_NAME@
Description: @VMIME_PACKAGE_DESCRIPTION@ Description: @VMIME_PACKAGE_DESCRIPTION@
Version: @VMIME_PACKAGE_VERSION@ Version: @VMIME_PACKAGE_VERSION@
Requires: @VMIME_PKGCONFIG_REQUIRES@ Requires.private: @VMIME_PKGCONFIG_REQUIRES@
Libs: -L${libdir} -lvmime @VMIME_PKGCONFIG_LIBS@ Libs.private: -L${libdir} -l@VMIME_LIBRARY_NAME@ @VMIME_PKGCONFIG_LIBS@
Cflags: -I${includedir}/ @VMIME_PKGCONFIG_CFLAGS@ Cflags: -I${includedir}/ @VMIME_PKGCONFIG_CFLAGS@