diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2018-11-02 08:46:04 +0200 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2018-11-02 08:46:04 +0200 |
| commit | c2caca02ac39454e18db8de563e7e7c8eaf8b1c7 (patch) | |
| tree | b340a4f6b67f7a43e4c8885ea9d634ef89e0edcc /cmake | |
| parent | b9a69f776d3dea825bc23759660258c28bf58cc7 (diff) | |
| parent | 9eb8a46790c556a9f683a14aea71e775f4fbe802 (diff) | |
| download | mariadb-git-c2caca02ac39454e18db8de563e7e7c8eaf8b1c7.tar.gz | |
Merge remote-tracking branch 'origin/10.0' into 10.0-galera
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}") |