diff options
| author | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-06-08 20:44:25 -0300 |
|---|---|---|
| committer | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-06-08 20:44:25 -0300 |
| commit | 60153dd36e2a79150565635d1370ed64df7cc07d (patch) | |
| tree | fadc512853996f25c9d2a32d76d220ae17f7aad4 /cmake/ssl.cmake | |
| parent | f6b5b2973074205300f9461676d98fdf92ae993c (diff) | |
| parent | 75a18e24fa72cca07254cbabd119b944c0ef989d (diff) | |
| download | mariadb-git-60153dd36e2a79150565635d1370ed64df7cc07d.tar.gz | |
Merge of mysql-5.1-bugteam into mysql-trunk-merge.
Diffstat (limited to 'cmake/ssl.cmake')
| -rw-r--r-- | cmake/ssl.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmake/ssl.cmake b/cmake/ssl.cmake index 2bf9b561bba..b101c26e241 100644 --- a/cmake/ssl.cmake +++ b/cmake/ssl.cmake @@ -25,7 +25,7 @@ MACRO (MYSQL_USE_BUNDLED_SSL) SET(SSL_LIBRARIES yassl taocrypt) SET(SSL_INCLUDE_DIRS ${INC_DIRS}) SET(SSL_INTERNAL_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/extra/yassl/taocrypt/mySTL) - SET(SSL_DEFINES "-DHAVE_YASSL -DYASSL_PURE_C -DYASSL_PREFIX -DHAVE_OPENSSL") + SET(SSL_DEFINES"-DHAVE_YASSL -DYASSL_PURE_C -DYASSL_PREFIX -DHAVE_OPENSSL -DYASSL_THREAD_SAFE") CHANGE_SSL_SETTINGS("bundled") #Remove -fno-implicit-templates #(yassl sources cannot be compiled with it) |