Fixed OpenSSL version regex
authorArmin Novak <armin.novak@gmail.com>
Tue, 27 Jan 2015 20:46:57 +0000 (21:46 +0100)
committerArmin Novak <armin.novak@thincast.com>
Fri, 30 Jan 2015 07:54:10 +0000 (08:54 +0100)
Starting with OpenSSL 1.0.2 source code is reformatted.
This patch takes care of the differences in the define
spacing.

cmake/FindOpenSSL.cmake

index 348d527..e7ad8bf 100644 (file)
@@ -268,7 +268,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.