diff options
Diffstat (limited to 'databases/mysql80-server/files/patch-cmake_ssl.cmake')
| -rw-r--r-- | databases/mysql80-server/files/patch-cmake_ssl.cmake | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/databases/mysql80-server/files/patch-cmake_ssl.cmake b/databases/mysql80-server/files/patch-cmake_ssl.cmake index c9a66c421b23..8fc3814b1342 100644 --- a/databases/mysql80-server/files/patch-cmake_ssl.cmake +++ b/databases/mysql80-server/files/patch-cmake_ssl.cmake @@ -1,15 +1,14 @@ ---- cmake/ssl.cmake.orig 2016-08-12 10:55:07 UTC +--- cmake/ssl.cmake.orig 2018-04-29 16:21:47 UTC +++ cmake/ssl.cmake -@@ -179,6 +179,12 @@ MACRO (MYSQL_CHECK_SSL) - OPENSSL_MAJOR_VERSION STREQUAL "1" +@@ -265,10 +265,10 @@ MACRO (MYSQL_CHECK_SSL) + OPENSSL_MAJOR_VERSION "${OPENSSL_VERSION_NUMBER}" + ) + ENDIF() + IF(OPENSSL_INCLUDE_DIR AND + OPENSSL_LIBRARY AND + CRYPTO_LIBRARY AND +- OPENSSL_MAJOR_VERSION STREQUAL "1" ++ (OPENSSL_MAJOR_VERSION STREQUAL "1" OR OPENSSL_MAJOR_VERSION STREQUAL "2") ) SET(OPENSSL_FOUND TRUE) -+ ELSEIF(OPENSSL_INCLUDE_DIR AND -+ OPENSSL_LIBRARY AND -+ CRYPTO_LIBRARY AND -+ OPENSSL_MAJOR_VERSION STREQUAL "2" -+ ) -+ SET(OPENSSL_FOUND TRUE) - ELSE() - SET(OPENSSL_FOUND FALSE) - ENDIF() + FIND_PROGRAM(OPENSSL_EXECUTABLE openssl |