diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-02-02 13:00:15 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-02-02 13:00:15 +0200 |
| commit | 213ece2f2e8c23ee0e727cc02dcecfae6f510ca2 (patch) | |
| tree | 5ce93ecb5caa9a58ebc08f8cd3e94c59d7219377 /cmake | |
| parent | c1e1764fc4b913ee688b383aac2698b83661d64c (diff) | |
| parent | d9d83f1d92b696ef56f4944df036b8a78364ebb4 (diff) | |
| download | mariadb-git-213ece2f2e8c23ee0e727cc02dcecfae6f510ca2.tar.gz | |
Merge 10.1 into 10.1
This is joint work with Oleksandr Byelkin.
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/build_configurations/mysql_release.cmake | 1 | ||||
| -rw-r--r-- | cmake/ssl.cmake | 10 |
2 files changed, 9 insertions, 2 deletions
diff --git a/cmake/build_configurations/mysql_release.cmake b/cmake/build_configurations/mysql_release.cmake index 04860a40dbb..b73b44cddc3 100644 --- a/cmake/build_configurations/mysql_release.cmake +++ b/cmake/build_configurations/mysql_release.cmake @@ -83,7 +83,6 @@ IF(FEATURE_SET) ENDIF() ENDIF() -OPTION(ENABLED_LOCAL_INFILE "" ON) SET(WITH_INNODB_SNAPPY OFF CACHE STRING "") IF(WIN32) SET(WITH_LIBARCHIVE STATIC CACHE STRING "") diff --git a/cmake/ssl.cmake b/cmake/ssl.cmake index 24e18600402..308f725a02d 100644 --- a/cmake/ssl.cmake +++ b/cmake/ssl.cmake @@ -177,12 +177,20 @@ MACRO (MYSQL_CHECK_SSL) ENDIF() INCLUDE(CheckSymbolExists) + INCLUDE(CheckCSourceCompiles) SET(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIR}) CHECK_SYMBOL_EXISTS(SHA512_DIGEST_LENGTH "openssl/sha.h" HAVE_SHA512_DIGEST_LENGTH) + CHECK_C_SOURCE_COMPILES(" + #include <openssl/dh.h> + int main() + { + DH dh; + return sizeof(dh.version); + }" OLD_OPENSSL_API) SET(CMAKE_REQUIRED_INCLUDES) IF(OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARIES AND - OPENSSL_MAJOR_VERSION STRLESS "101" AND + OLD_OPENSSL_API AND CRYPTO_LIBRARY AND HAVE_SHA512_DIGEST_LENGTH) SET(SSL_SOURCES "") |