From 604a06eb36cad29bbf4603391d1bfce371b1529d Mon Sep 17 00:00:00 2001 From: Vincent-Michael Date: Fri, 9 Sep 2016 00:59:38 +0200 Subject: [PATCH] Cmake: Added OpenSSL version required --- cmake/macros/FindOpenSSL.cmake | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cmake/macros/FindOpenSSL.cmake b/cmake/macros/FindOpenSSL.cmake index 7baa43274ab..d495f1ed2a4 100644 --- a/cmake/macros/FindOpenSSL.cmake +++ b/cmake/macros/FindOpenSSL.cmake @@ -25,6 +25,9 @@ # http://www.slproweb.com/products/Win32OpenSSL.html +set(OPENSSL_EXPECTED_VERSION "1.0") +set(OPENSSL_MAX_VERSION "1.1") + SET(_OPENSSL_ROOT_HINTS "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (32-bit)_is1;Inno Setup: App Path]" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (64-bit)_is1;Inno Setup: App Path]" @@ -218,7 +221,7 @@ if (OPENSSL_INCLUDE_DIR) endif (_OPENSSL_VERSION) include(EnsureVersion) - ENSURE_VERSION( "${OPENSSL_EXPECTED_VERSION}" "${OPENSSL_VERSION}" OPENSSL_VERSION_OK) + ENSURE_VERSION_RANGE("${OPENSSL_EXPECTED_VERSION}" "${OPENSSL_VERSION}" "${OPENSSL_MAX_VERSION}" OPENSSL_VERSION_OK) if (NOT OPENSSL_VERSION_OK) message(FATAL_ERROR "TrinityCore needs OpenSSL version ${OPENSSL_EXPECTED_VERSION} but found version ${OPENSSL_VERSION}") endif()