Explorar o código

Merge topic 'FindOpenSSL-use-header-version'

99b13820 FindOpenSSL: Always extract version from detected header (#15075)
Brad King %!s(int64=10) %!d(string=hai) anos
pai
achega
63412a85e0
Modificáronse 1 ficheiros con 1 adicións e 3 borrados
  1. 1 3
      Modules/FindOpenSSL.cmake

+ 1 - 3
Modules/FindOpenSSL.cmake

@@ -283,9 +283,7 @@ function(from_hex HEX DEC)
 endfunction()
 endfunction()
 
 
 if (OPENSSL_INCLUDE_DIR)
 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
     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])+.*")