summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <[email protected]>2019-02-16 19:17:09 +0100
committerSlávek Banko <[email protected]>2019-02-16 19:17:09 +0100
commit5de71676ac3ab1b305ff02185bb683af1a1c3dee (patch)
treeea03f52ac320d1b11297bee90a47fd6ff65cf382
parent0656a7511d0ef8f76d1e25a6d39dcc7c1b44de6c (diff)
downloadtdelibs-5de71676ac3ab1b305ff02185bb683af1a1c3dee.tar.gz
tdelibs-5de71676ac3ab1b305ff02185bb683af1a1c3dee.zip
Fix openssl >= 1.1 detection without pkg-config file.
Signed-off-by: Slávek Banko <[email protected]>
-rw-r--r--CMakeLists.txt15
1 files changed, 12 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 60c6a60a5..d28a2ad6b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1022,11 +1022,20 @@ if( WITH_SSL )
pkg_search_module( SSL openssl )
if( NOT SSL_FOUND )
check_include_file( openssl/ssl.h HAVE_OPENSSL_H )
- check_library_exists( ssl SSL_library_init "" HAVE_LIBSSL )
+ check_library_exists( ssl OPENSSL_init_ssl "" HAVE_LIBSSL_11 )
+ if( NOT HAVE_LIBSSL_11 )
+ check_library_exists( ssl SSL_library_init "" HAVE_LIBSSL )
+ endif( )
check_library_exists( crypto EVP_EncryptInit_ex "" HAVE_LIBCRYPTO )
- if( HAVE_OPENSSL_H AND HAVE_LIBSSL AND HAVE_LIBCRYPTO )
+ if( HAVE_OPENSSL_H AND (HAVE_LIBSSL_11 OR HAVEL_LIBSSL) AND HAVE_LIBCRYPTO )
set( SSL_FOUND 1 CACHE INTERNAL "" FORCE )
- endif( HAVE_OPENSSL_H AND HAVE_LIBSSL AND HAVE_LIBCRYPTO )
+ find_file( OPENSSLV_H openssl/opensslv.h )
+ file( STRINGS "${OPENSSLV_H}" SSL_VERSION REGEX "#[ \t]*define[ \t]*OPENSSL_VERSION_TEXT" )
+ string( REGEX REPLACE "# *define[ \t]*OPENSSL_VERSION_TEXT[ \t]*\"[^0-9 ]* *([^ ]*).*" "\\1"
+ SSL_VERSION "${SSL_VERSION}" )
+ set( SSL_VERSION "${SSL_VERSION}" CACHE INTERNAL "" FORCE )
+ message( STATUS "Found OpenSSL: version ${SSL_VERSION}" )
+ endif( HAVE_OPENSSL_H AND (HAVE_LIBSSL_11 OR HAVEL_LIBSSL) AND HAVE_LIBCRYPTO )
endif( NOT SSL_FOUND )
if( NOT SSL_FOUND )
tde_message_fatal( "SSL support is requested, but openssl not found on your system" )