From 99b13820715ff3b98c2c0cb114b38620b6da4466 Mon Sep 17 00:00:00 2001 From: Aku Kotkavuo Date: Sat, 10 Jan 2015 00:40:20 +0200 Subject: [PATCH] FindOpenSSL: Always extract version from detected header (#15075) Do not use the _OPENSSL_VERSION computed by pkg-config because the user may change OPENSSL_INCLUDE_DIR. --- Modules/FindOpenSSL.cmake | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Modules/FindOpenSSL.cmake b/Modules/FindOpenSSL.cmake index b2722a6db..bfbe01f59 100644 --- a/Modules/FindOpenSSL.cmake +++ b/Modules/FindOpenSSL.cmake @@ -283,9 +283,7 @@ function(from_hex HEX DEC) endfunction() if (OPENSSL_INCLUDE_DIR) - if (_OPENSSL_VERSION) - set(OPENSSL_VERSION "${_OPENSSL_VERSION}") - elseif(OPENSSL_INCLUDE_DIR AND EXISTS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h") + if(OPENSSL_INCLUDE_DIR AND EXISTS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h") file(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h" openssl_version_str REGEX "^#define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x([0-9a-fA-F])+.*")