commit 54eeccbfb61e0796f9435a6207e79d5c50b7116a
author Brad King <brad.king@kitware.com> Thu May 28 10:50:44 2020 +0000
committer Kitware Robot <kwrobot@kitware.com> Thu May 28 06:51:52 2020 -0400
tree fb1e37c240170ee73afd6e7ae57512b458b35729
parent 1b8b98a8849377d1dfc3015eb9f4f79fd14dba96
parent 61d746e5922de50310558364f157b261f3e7917a

Merge topic 'openssl-3.0.0' into release-3.17

61d746e592 FindOpenSSL: Detect OpenSSL 3.0.0

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4805

Modules/FindOpenSSL.cmake

diff --git a/Modules/FindOpenSSL.cmake b/Modules/FindOpenSSL.cmake
index af713d6..45b641d 100644
--- a/Modules/FindOpenSSL.cmake
+++ b/Modules/FindOpenSSL.cmake
@@ -415,6 +415,15 @@
     endif ()
 
     set(OPENSSL_VERSION "${OPENSSL_VERSION_MAJOR}.${OPENSSL_VERSION_MINOR}.${OPENSSL_VERSION_FIX}${OPENSSL_VERSION_PATCH_STRING}")
+  else ()
+    # Since OpenSSL 3.0.0, the new version format is MAJOR.MINOR.PATCH and
+    # a new OPENSSL_VERSION_STR macro contains exactly that
+    file(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h" OPENSSL_VERSION_STR
+         REGEX "^#[\t ]*define[\t ]+OPENSSL_VERSION_STR[\t ]+\"([0-9])+\.([0-9])+\.([0-9])+\".*")
+    string(REGEX REPLACE "^.*OPENSSL_VERSION_STR[\t ]+\"([0-9]+\.[0-9]+\.[0-9]+)\".*$"
+           "\\1" OPENSSL_VERSION_STR "${OPENSSL_VERSION_STR}")
+
+    set(OPENSSL_VERSION "${OPENSSL_VERSION_STR}")
   endif ()
 endif ()