diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2019-02-16 19:17:09 +0100 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2019-02-16 19:17:49 +0100 |
| commit | 24c62fe93e4cb1bdefbc49d9a629293514fa6f61 (patch) | |
| tree | 601ed951d6d69e49f3f7cd974e3cbf68c29d6e16 | |
| parent | f964702b03c6009216cb7e80f3524eb9873753e0 (diff) | |
| download | tdelibs-24c62fe93e4cb1bdefbc49d9a629293514fa6f61.tar.gz tdelibs-24c62fe93e4cb1bdefbc49d9a629293514fa6f61.zip | |
Fix openssl >= 1.1 detection without pkg-config file.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 5de71676ac3ab1b305ff02185bb683af1a1c3dee)
| -rw-r--r-- | CMakeLists.txt | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 5e1fbd83d..0dddcafe2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -921,11 +921,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" ) |