View | Details | Raw Unified | Return to bug 165604 | Differences between
and this patch

Collapse All | Expand All

(-)cmake/ssl.cmake (-1 / +4 lines)
Lines 64-74 Link Here
64
    MYSQL_USE_BUNDLED_SSL()
64
    MYSQL_USE_BUNDLED_SSL()
65
  ELSEIF(WITH_SSL STREQUAL "system" OR WITH_SSL STREQUAL "yes")
65
  ELSEIF(WITH_SSL STREQUAL "system" OR WITH_SSL STREQUAL "yes")
66
    # Check for system library
66
    # Check for system library
67
    SET(OPENSSL_FIND_QUIETLY TRUE)
67
#    SET(OPENSSL_FIND_QUIETLY TRUE)
68
    INCLUDE(FindOpenSSL)
68
    INCLUDE(FindOpenSSL)
69
    MESSAGE(STATUS "OPENSSL_INCLUDE_DIR = ${OPENSSL_INCLUDE_DIR}")
70
    MESSAGE(STATUS "OPENSSL_LIBRARIES = ${OPENSSL_LIBRARIES}")
69
    FIND_LIBRARY(CRYPTO_LIBRARY crypto)
71
    FIND_LIBRARY(CRYPTO_LIBRARY crypto)
70
    MARK_AS_ADVANCED(CRYPTO_LIBRARY)
72
    MARK_AS_ADVANCED(CRYPTO_LIBRARY)
71
    INCLUDE(CheckSymbolExists)
73
    INCLUDE(CheckSymbolExists)
74
    SET(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIR})
72
    CHECK_SYMBOL_EXISTS(SHA512_DIGEST_LENGTH "openssl/sha.h" 
75
    CHECK_SYMBOL_EXISTS(SHA512_DIGEST_LENGTH "openssl/sha.h" 
73
                        HAVE_SHA512_DIGEST_LENGTH)
76
                        HAVE_SHA512_DIGEST_LENGTH)
74
    IF(OPENSSL_FOUND AND CRYPTO_LIBRARY AND HAVE_SHA512_DIGEST_LENGTH)
77
    IF(OPENSSL_FOUND AND CRYPTO_LIBRARY AND HAVE_SHA512_DIGEST_LENGTH)

Return to bug 165604