diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-02-04 17:07:47 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-02-10 10:21:16 +0100 |
| commit | 0d676fa0b745257673e0f986472209d313aa4dae (patch) | |
| tree | 18efe295e31579c10a0a38391ec297811113c01c | |
| parent | 4280b25ed85dba6e231d483e58a1c90b91730434 (diff) | |
| download | mariadb-git-0d676fa0b745257673e0f986472209d313aa4dae.tar.gz | |
minor cleanup: ssl.cmake
| -rw-r--r-- | cmake/ssl.cmake | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/cmake/ssl.cmake b/cmake/ssl.cmake index 949f39f66c2..0eabcba24c3 100644 --- a/cmake/ssl.cmake +++ b/cmake/ssl.cmake @@ -170,15 +170,6 @@ MACRO (MYSQL_CHECK_SSL) OPENSSL_MAJOR_VERSION "${OPENSSL_VERSION_NUMBER}" ) - IF(OPENSSL_INCLUDE_DIR AND - OPENSSL_LIBRARIES AND - CRYPTO_LIBRARY - ) - SET(OPENSSL_FOUND TRUE) - ELSE() - SET(OPENSSL_FOUND FALSE) - ENDIF() - MESSAGE(STATUS "OPENSSL_INCLUDE_DIR = ${OPENSSL_INCLUDE_DIR}") MESSAGE(STATUS "OPENSSL_LIBRARIES = ${OPENSSL_LIBRARIES}") MESSAGE(STATUS "CRYPTO_LIBRARY = ${CRYPTO_LIBRARY}") @@ -188,7 +179,8 @@ MACRO (MYSQL_CHECK_SSL) SET(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIR}) CHECK_SYMBOL_EXISTS(SHA512_DIGEST_LENGTH "openssl/sha.h" HAVE_SHA512_DIGEST_LENGTH) - IF(OPENSSL_FOUND AND HAVE_SHA512_DIGEST_LENGTH) + IF(OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARIES AND + CRYPTO_LIBRARY AND HAVE_SHA512_DIGEST_LENGTH) SET(SSL_SOURCES "") SET(SSL_LIBRARIES ${OPENSSL_LIBRARIES} ${CRYPTO_LIBRARY}) IF(CMAKE_SYSTEM_NAME MATCHES "SunOS") |