diff options
| author | Brad King <brad.king@kitware.com> | 2015-01-28 14:33:42 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-01-28 14:33:42 (GMT) |
| commit | de4ccee75a89519f95fcbcca75abc46577bfefea (patch) | |
| tree | cf14ffb7d04eef66ecf31f74edcc709d42363b12 | |
| parent | b7d7b306541a8ff1a7e8384f5c44baabec3ec94d (diff) | |
| parent | c5d9a8283cfac15b4a5a07f18d5eb10c1f388505 (diff) | |
| download | CMake-de4ccee75a89519f95fcbcca75abc46577bfefea.zip CMake-de4ccee75a89519f95fcbcca75abc46577bfefea.tar.gz CMake-de4ccee75a89519f95fcbcca75abc46577bfefea.tar.bz2 | |
Merge topic 'OpenSSL_102'
c5d9a828 FindOpenSSL: fix detection of OpenSSL 1.0.2
| -rw-r--r-- | Modules/FindOpenSSL.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/FindOpenSSL.cmake b/Modules/FindOpenSSL.cmake index bfbe01f..3adc269 100644 --- a/Modules/FindOpenSSL.cmake +++ b/Modules/FindOpenSSL.cmake @@ -285,7 +285,7 @@ endfunction() if (OPENSSL_INCLUDE_DIR) 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])+.*") + REGEX "^# *define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x([0-9a-fA-F])+.*") # The version number is encoded as 0xMNNFFPPS: major minor fix patch status # The status gives if this is a developer or prerelease and is ignored here. |