diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-10-31 00:25:26 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-10-31 00:25:26 +0100 |
| commit | 09e97299ba893b7578cac8160b3b687b0594aeee (patch) | |
| tree | a197980e92b9cc6e19d04bfb0efcaffdc483f2db /cmake | |
| parent | a737135ae39dafe8b1136386ce23dfa8bed877f9 (diff) | |
| parent | 31f1fe223e3ca0f2a44f7e55df05f096552ae61e (diff) | |
| download | mariadb-git-09e97299ba893b7578cac8160b3b687b0594aeee.tar.gz | |
Merge branch '5.5' into 10.0
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/ssl.cmake | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/cmake/ssl.cmake b/cmake/ssl.cmake index c5985a38621..c76e73927c0 100644 --- a/cmake/ssl.cmake +++ b/cmake/ssl.cmake @@ -170,7 +170,7 @@ MACRO (MYSQL_CHECK_SSL) REGEX "^#define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x[0-9].*" ) STRING(REGEX REPLACE - "^.*OPENSSL_VERSION_NUMBER[\t ]+0x([0-9]).*$" "\\1" + "^.*OPENSSL_VERSION_NUMBER[\t ]+0x([0-9][0-9][0-9]).*$" "\\1" OPENSSL_MAJOR_VERSION "${OPENSSL_VERSION_NUMBER}" ) INCLUDE(CheckSymbolExists) @@ -182,7 +182,8 @@ MACRO (MYSQL_CHECK_SSL) SET(OPENSSL_FOUND FALSE) ENDIF() - IF(OPENSSL_FOUND AND HAVE_SHA512_DIGEST_LENGTH) + IF(OPENSSL_FOUND AND OPENSSL_MAJOR_VERSION STRLESS "101" AND + HAVE_SHA512_DIGEST_LENGTH) MESSAGE(STATUS "OPENSSL_INCLUDE_DIR = ${OPENSSL_INCLUDE_DIR}") MESSAGE(STATUS "OPENSSL_LIBRARIES = ${OPENSSL_LIBRARIES}") MESSAGE(STATUS "CRYPTO_LIBRARY = ${CRYPTO_LIBRARY}") |