Navigation


Changeset 746:96c75744d3c4 in freeDiameter for cmake


Ignore:
Timestamp:
Jul 29, 2011, 6:49:17 AM (13 years ago)
Author:
Sebastien Decugis <sdecugis@freediameter.net>
Branch:
default
Phase:
public
Message:

Attempt to support newer GNU TLS libraries. Need more work...

File:
1 edited

Legend:

Unmodified
Added
Removed
  • cmake/Modules/FindGnuTLS.cmake

    r493 r746  
    55#  GNUTLS_INCLUDE_DIR - where to find gnutls.h, etc.
    66#  GNUTLS_LIBRARIES - List of libraries when using gnutls.
     7#  GNUTLS_NEW_VERSION - true if GnuTLS version is <= 2.10.0 (does not require additional separate gcrypt initialization)
    78
    89if (GNUTLS_INCLUDE_DIR AND GNUTLS_LIBRARIES)
     
    3637# only show up under the advanced options in the gui cmake applications.
    3738MARK_AS_ADVANCED( GNUTLS_LIBRARY GNUTLS_INCLUDE_DIR )
     39
     40# Now check if the library is recent. gnutls_hash was added in 2.10.0.
     41IF( NOT( "${GNUTLS_VERSION_TEST_FOR}" STREQUAL "${GNUTLS_LIBRARY}" ))
     42  INCLUDE (CheckLibraryExists)
     43  MESSAGE(STATUS "Rechecking GNUTLS_NEW_VERSION")
     44  UNSET(GNUTLS_NEW_VERSION)
     45  UNSET(GNUTLS_NEW_VERSION CACHE)
     46  GET_FILENAME_COMPONENT(GNUTLS_PATH ${GNUTLS_LIBRARY} PATH)
     47  CHECK_LIBRARY_EXISTS(gnutls gnutls_hash ${GNUTLS_PATH} GNUTLS_NEW_VERSION)
     48  SET( GNUTLS_VERSION_TEST_FOR ${GNUTLS_LIBRARY} CACHE INTERNAL "Version the test was made against" )
     49ENDIF (NOT( "${GNUTLS_VERSION_TEST_FOR}" STREQUAL "${GNUTLS_LIBRARY}" ))
Note: See TracChangeset for help on using the changeset viewer.