diff options
| author | Brad King <brad.king@kitware.com> | 2015-01-12 13:57:42 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-01-12 13:57:42 (GMT) |
| commit | 63412a85e0e2431895bf4f2122d901e17f4c51b0 (patch) | |
| tree | bf9e13f46eea0b9eaaeb4b81de987ac00c2db045 /Modules | |
| parent | b5a467262b61065ed5d1b8d545cc2ade548b9d0b (diff) | |
| parent | 99b13820715ff3b98c2c0cb114b38620b6da4466 (diff) | |
| download | CMake-63412a85e0e2431895bf4f2122d901e17f4c51b0.zip CMake-63412a85e0e2431895bf4f2122d901e17f4c51b0.tar.gz CMake-63412a85e0e2431895bf4f2122d901e17f4c51b0.tar.bz2 | |
Merge topic 'FindOpenSSL-use-header-version'
99b13820 FindOpenSSL: Always extract version from detected header (#15075)
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindOpenSSL.cmake | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/Modules/FindOpenSSL.cmake b/Modules/FindOpenSSL.cmake index b2722a6..bfbe01f 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])+.*") |