Commit edaeaeff authored by Sebastien Decugis's avatar Sebastien Decugis
Browse files

Add explicit requirement on libgcrypt for app_diameap.fdx, this lib no longer...

Add explicit requirement on libgcrypt for app_diameap.fdx, this lib no longer comes implicitely with gnutls in the core
parent 3e2338ed
# - 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 )
...@@ -3,6 +3,7 @@ PROJECT("Diameter EAP Application extension" C) ...@@ -3,6 +3,7 @@ PROJECT("Diameter EAP Application extension" C)
# Find MySQL # Find MySQL
FIND_PACKAGE(MySQL REQUIRED) FIND_PACKAGE(MySQL REQUIRED)
FIND_PACKAGE(Gcrypt REQUIRED)
INCLUDE_DIRECTORIES(${MySQL_INCLUDE_DIR}) INCLUDE_DIRECTORIES(${MySQL_INCLUDE_DIR})
# Parse plugins # Parse plugins
...@@ -45,7 +46,7 @@ set( diameapsrc ...@@ -45,7 +46,7 @@ set( diameapsrc
FD_ADD_EXTENSION(app_diameap ${diameapsrc}) FD_ADD_EXTENSION(app_diameap ${diameapsrc})
TARGET_LINK_LIBRARIES(app_diameap ${MySQL_LIBRARY}) TARGET_LINK_LIBRARIES(app_diameap ${GCRYPT_LIBRARY} ${MySQL_LIBRARY})
#### ####
## INSTALL section ## ## INSTALL section ##
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment