diff options
| author | Brad King <brad.king@kitware.com> | 2015-01-28 13:52:51 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-01-28 13:52:51 (GMT) |
| commit | 5d96094874c148365441612158acf2039d421538 (patch) | |
| tree | 0cbfcc0fa95c66e21339c725ddc5d056defb11fe | |
| parent | 163bbff24afb284f3de142354c6c6ec75a6a7b67 (diff) | |
| parent | c5d9a8283cfac15b4a5a07f18d5eb10c1f388505 (diff) | |
| download | CMake-5d96094874c148365441612158acf2039d421538.zip CMake-5d96094874c148365441612158acf2039d421538.tar.gz CMake-5d96094874c148365441612158acf2039d421538.tar.bz2 | |
Merge branch 'OpenSSL_102' into release
| -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 340b417..6b4f985 100644 --- a/Modules/FindOpenSSL.cmake +++ b/Modules/FindOpenSSL.cmake @@ -279,7 +279,7 @@ if (OPENSSL_INCLUDE_DIR) set(OPENSSL_VERSION "${_OPENSSL_VERSION}") elseif(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. |