Mercurial > hg > freeDiameter
changeset 823:f145c687c5f3
Add explicit requirement on libgcrypt for app_diameap.fdx, this lib no longer comes implicitely with gnutls in the core
| author | Sebastien Decugis <sdecugis@freediameter.net> |
|---|---|
| date | Wed, 12 Sep 2012 20:43:51 +0200 |
| parents | df71824ca960 |
| children | 89c5849b0832 |
| files | cmake/Modules/FindGcrypt.cmake extensions/app_diameap/CMakeLists.txt |
| diffstat | 2 files changed, 38 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cmake/Modules/FindGcrypt.cmake Wed Sep 12 20:43:51 2012 +0200 @@ -0,0 +1,36 @@ +# - Find gnutls +# Find the native GCRYPT includes and library +# +# GCRYPT_FOUND - True if gnutls found. +# GCRYPT_INCLUDE_DIR - where to find gnutls.h, etc. +# GCRYPT_LIBRARIES - List of libraries when using gnutls. + +if (GCRYPT_INCLUDE_DIR AND GCRYPT_LIBRARIES) + set(GCRYPT_FIND_QUIETLY TRUE) +endif (GCRYPT_INCLUDE_DIR AND GCRYPT_LIBRARIES) + +# Include dir +find_path(GCRYPT_INCLUDE_DIR + NAMES + gcrypt.h +) + +# Library +find_library(GCRYPT_LIBRARY + NAMES gcrypt +) + +# handle the QUIETLY and REQUIRED arguments and set GCRYPT_FOUND to TRUE if +# all listed variables are TRUE +INCLUDE(FindPackageHandleStandardArgs) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(GCRYPT DEFAULT_MSG GCRYPT_LIBRARY GCRYPT_INCLUDE_DIR) + +IF(GCRYPT_FOUND) + SET( GCRYPT_LIBRARIES ${GCRYPT_LIBRARY} ) +ELSE(GCRYPT_FOUND) + SET( GCRYPT_LIBRARIES ) +ENDIF(GCRYPT_FOUND) + +# Lastly make it so that the GCRYPT_LIBRARY and GCRYPT_INCLUDE_DIR variables +# only show up under the advanced options in the gui cmake applications. +MARK_AS_ADVANCED( GCRYPT_LIBRARY GCRYPT_INCLUDE_DIR )
--- a/extensions/app_diameap/CMakeLists.txt Tue Sep 11 20:51:40 2012 +0200 +++ b/extensions/app_diameap/CMakeLists.txt Wed Sep 12 20:43:51 2012 +0200 @@ -3,6 +3,7 @@ # Find MySQL FIND_PACKAGE(MySQL REQUIRED) +FIND_PACKAGE(Gcrypt REQUIRED) INCLUDE_DIRECTORIES(${MySQL_INCLUDE_DIR}) # Parse plugins @@ -45,7 +46,7 @@ FD_ADD_EXTENSION(app_diameap ${diameapsrc}) -TARGET_LINK_LIBRARIES(app_diameap ${MySQL_LIBRARY}) +TARGET_LINK_LIBRARIES(app_diameap ${GCRYPT_LIBRARY} ${MySQL_LIBRARY}) #### ## INSTALL section ##