diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-12-21 16:36:10 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-12-21 16:36:10 +0100 |
| commit | 05dc86c09fb2e001ac80654a97c0870eee6aea82 (patch) | |
| tree | ccc8958214c21e9bc374ba4262a56d4703ffefc5 /cmake/ssl.cmake | |
| parent | 865548fc8d0574e6418b66def39b6d36bbc0205a (diff) | |
| parent | e126baafbc78f15c794082f0a93740d81041d038 (diff) | |
| download | mariadb-git-05dc86c09fb2e001ac80654a97c0870eee6aea82.tar.gz | |
Merge branch '5.5' into 10.0
Diffstat (limited to 'cmake/ssl.cmake')
| -rw-r--r-- | cmake/ssl.cmake | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/cmake/ssl.cmake b/cmake/ssl.cmake index 26df7a47e0a..f9daa29f4b9 100644 --- a/cmake/ssl.cmake +++ b/cmake/ssl.cmake @@ -55,6 +55,7 @@ MACRO (MYSQL_USE_BUNDLED_SSL) SET(SSL_INCLUDE_DIRS ${INC_DIRS}) SET(SSL_INTERNAL_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/extra/yassl/taocrypt/mySTL) SET(SSL_DEFINES "-DHAVE_YASSL -DYASSL_PREFIX -DHAVE_OPENSSL -DMULTI_THREADED") + SET(HAVE_ERR_remove_thread_state OFF CACHE INTERNAL "yassl doesn't have ERR_remove_thread_state") CHANGE_SSL_SETTINGS("bundled") ADD_SUBDIRECTORY(extra/yassl) ADD_SUBDIRECTORY(extra/yassl/taocrypt) @@ -199,6 +200,10 @@ MACRO (MYSQL_CHECK_SSL) SET(SSL_INCLUDE_DIRS ${OPENSSL_INCLUDE_DIR}) SET(SSL_INTERNAL_INCLUDE_DIRS "") SET(SSL_DEFINES "-DHAVE_OPENSSL") + + SET(CMAKE_REQUIRED_LIBRARIES ${SSL_LIBRARIES}) + CHECK_SYMBOL_EXISTS(ERR_remove_thread_state "openssl/err.h" + HAVE_ERR_remove_thread_state) ELSE() IF(WITH_SSL STREQUAL "system") MESSAGE(SEND_ERROR "Cannot find appropriate system libraries for SSL. Use WITH_SSL=bundled to enable SSL support") |