summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2019-02-16 19:27:31 +0100
committerSlávek Banko <slavek.banko@axis.cz>2019-02-16 19:27:31 +0100
commitb1b24c0b64755fe135c47ba0963666fbc15b5c26 (patch)
treea87f6b7862d8aee600fd3998227a160ee043175b
parent98abb9e8ee924fb0b19cf8bfc40752f97ed8afb3 (diff)
downloadtdebase-b1b24c0b64755fe135c47ba0963666fbc15b5c26.zip
tdebase-b1b24c0b64755fe135c47ba0963666fbc15b5c26.tar.gz
Fix openssl >= 1.1 detection without pkg-config file.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
-rw-r--r--kcontrol/crypto/CMakeLists.txt15
1 files changed, 12 insertions, 3 deletions
diff --git a/kcontrol/crypto/CMakeLists.txt b/kcontrol/crypto/CMakeLists.txt
index 9a7f916..0337880 100644
--- a/kcontrol/crypto/CMakeLists.txt
+++ b/kcontrol/crypto/CMakeLists.txt
@@ -17,11 +17,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" )