diff options
| author | Vicențiu Ciorbaru <vicentiu@ciorbaru.io> | 2017-11-16 10:33:28 +0200 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-12-29 19:38:44 +0200 |
| commit | f9f976b217e6a9ad55d52ac8666d594208d9e3da (patch) | |
| tree | eaa3cfb688c2f79866bccd28b3c7e209f4a9d47c /cmake/ssl.cmake | |
| parent | b443c0e0566ba1d57e0c1d05c0fc5a6f4bc2357f (diff) | |
| download | mariadb-git-f9f976b217e6a9ad55d52ac8666d594208d9e3da.tar.gz | |
Fix ssl cmake configuration not checking for symbols properly
Both libraries and includes are required to check for symbols correctly.
In addition, we don't use SHA512_DIGEST_LENGTH symbol so remove the
extraneous check.
Diffstat (limited to 'cmake/ssl.cmake')
| -rw-r--r-- | cmake/ssl.cmake | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/cmake/ssl.cmake b/cmake/ssl.cmake index 65abb27923b..634ea03c3c2 100644 --- a/cmake/ssl.cmake +++ b/cmake/ssl.cmake @@ -129,10 +129,6 @@ MACRO (MYSQL_CHECK_SSL) IF(OPENSSL_FOUND) SET(OPENSSL_LIBRARY ${OPENSSL_SSL_LIBRARY}) INCLUDE(CheckSymbolExists) - SET(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIR}) - CHECK_SYMBOL_EXISTS(SHA512_DIGEST_LENGTH "openssl/sha.h" - HAVE_SHA512_DIGEST_LENGTH) - SET(CMAKE_REQUIRED_INCLUDES) SET(SSL_SOURCES "") SET(SSL_LIBRARIES ${OPENSSL_SSL_LIBRARY} ${OPENSSL_CRYPTO_LIBRARY}) IF(CMAKE_SYSTEM_NAME MATCHES "SunOS") @@ -151,6 +147,7 @@ MACRO (MYSQL_CHECK_SSL) SET(SSL_INTERNAL_INCLUDE_DIRS "") SET(SSL_DEFINES "-DHAVE_OPENSSL") + SET(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIR}) SET(CMAKE_REQUIRED_LIBRARIES ${SSL_LIBRARIES}) CHECK_SYMBOL_EXISTS(ERR_remove_thread_state "openssl/err.h" HAVE_ERR_remove_thread_state) @@ -158,6 +155,8 @@ MACRO (MYSQL_CHECK_SSL) HAVE_EncryptAes128Ctr) CHECK_SYMBOL_EXISTS(EVP_aes_128_gcm "openssl/evp.h" HAVE_EncryptAes128Gcm) + SET(CMAKE_REQUIRED_INCLUDES) + SET(CMAKE_REQUIRED_LIBRARIES) ELSE() IF(WITH_SSL STREQUAL "system") MESSAGE(SEND_ERROR "Cannot find appropriate system libraries for SSL. Use WITH_SSL=bundled to enable SSL support") |