mirrors/cmake
2
0 Fork 0
mirror of https://gitlab.kitware.com/cmake/cmake.git synced 2026-10-04 04:03:22 +03:00
Code Activity

FindOpenSSL: Always extract version from detected header (#15075)

Browse Source 
Do not use the _OPENSSL_VERSION computed by pkg-config because
the user may change OPENSSL_INCLUDE_DIR.
This commit is contained in:
Aku Kotkavuo authored and Brad King committed 2015-01-11 15:32:55 -05:00
1 parent 4aa9c64511
commit 99b1382071
1 file changed
+1 -3
Download Patch File Download Diff File Expand all files Collapse all files
Modules/FindOpenSSL.cmake
+1 -3
View File
@@ -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])+.*")