diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-10-29 23:21:55 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-10-29 23:21:58 +0100 |
| commit | 8772824ce72a811ea92dd5cfb73602eb93237891 (patch) | |
| tree | ebbcc8f5c7569968e06c8f24b9b6fedf0b833db8 /cmake | |
| parent | d5f564a9960d1689c36eaab50144e6e26576a50e (diff) | |
| download | mariadb-git-8772824ce72a811ea92dd5cfb73602eb93237891.tar.gz | |
Restore auto-switch to bundled ssl if WITH_SSL=yes
if -DWITH_SSL=yes and system ssl cannot be used,
bundled ssl should be auto-selected.
That's how it worked in 10.0, and it was unintentionally broken in 10.1.
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/ssl.cmake | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/cmake/ssl.cmake b/cmake/ssl.cmake index 18728c733db..9bbce599602 100644 --- a/cmake/ssl.cmake +++ b/cmake/ssl.cmake @@ -180,8 +180,7 @@ MACRO (MYSQL_CHECK_SSL) OPENSSL_MAJOR_VERSION "${OPENSSL_VERSION_NUMBER}" ) MESSAGE(STATUS "OPENSSL_MAJOR_VERSION = ${OPENSSL_MAJOR_VERSION}") - ENDIF() - IF(TRUE) #OPENSSL_MAJOR_VERSION GREATER 0) + SET(SSL_SOURCES "") SET(SSL_LIBRARIES ${OPENSSL_LIBRARIES} ${CRYPTO_LIBRARY}) IF(CMAKE_SYSTEM_NAME MATCHES "SunOS") |