Core/Build: Fix windows build for recent OpenSSL versions (#1065)

Closes #1047
This commit is contained in:
Viste(Кирилл)
2018-12-18 02:09:53 +03:00
committed by Nefertumm
parent 74e8e79e54
commit 4a52df6375
+13 -4
View File
@@ -35,12 +35,14 @@ IF(PLATFORM EQUAL 64)
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (64-bit)_is1;InstallLocation]" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (64-bit)_is1;InstallLocation]"
"C:/OpenSSL-Win64/" "C:/OpenSSL-Win64/"
"C:/OpenSSL/" "C:/OpenSSL/"
"C:/Program Files/OpenSSL-Win64/"
) )
ELSE() ELSE()
SET(_OPENSSL_ROOT_PATHS SET(_OPENSSL_ROOT_PATHS
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (32-bit)_is1;InstallLocation]" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (32-bit)_is1;InstallLocation]"
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (32-bit)_is1;InstallLocation]" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (32-bit)_is1;InstallLocation]"
"C:/OpenSSL/" "C:/OpenSSL/"
"C:/Program Files/OpenSSL/"
) )
ENDIF() ENDIF()
@@ -77,30 +79,37 @@ IF(WIN32 AND NOT CYGWIN)
# libeay32MD.lib is identical to ../libeay32.lib, and # libeay32MD.lib is identical to ../libeay32.lib, and
# ssleay32MD.lib is identical to ../ssleay32.lib # ssleay32MD.lib is identical to ../ssleay32.lib
# In 1.1 version of OpenSSL we have other names of libs: libcrypto32MTd.lib and libssl32MTd.lib
if( "${CMAKE_SIZEOF_VOID_P}" STREQUAL "8" )
set(_OPENSSL_MSVC_ARCH_SUFFIX "64")
else()
set(_OPENSSL_MSVC_ARCH_SUFFIX "32")
endif()
FIND_LIBRARY(LIB_EAY_DEBUG FIND_LIBRARY(LIB_EAY_DEBUG
NAMES NAMES
libeay32MDd libeay32 libcrypto${_OPENSSL_MSVC_ARCH_SUFFIX}MDd libeay32MDd libeay32
PATHS PATHS
${OPENSSL_ROOT_DIR}/lib/VC ${OPENSSL_ROOT_DIR}/lib/VC
) )
FIND_LIBRARY(LIB_EAY_RELEASE FIND_LIBRARY(LIB_EAY_RELEASE
NAMES NAMES
libeay32MD libeay32 libcrypto${_OPENSSL_MSVC_ARCH_SUFFIX}MD libeay32MD libeay32
PATHS PATHS
${OPENSSL_ROOT_DIR}/lib/VC ${OPENSSL_ROOT_DIR}/lib/VC
) )
FIND_LIBRARY(SSL_EAY_DEBUG FIND_LIBRARY(SSL_EAY_DEBUG
NAMES NAMES
ssleay32MDd ssleay32 ssl libssl${_OPENSSL_MSVC_ARCH_SUFFIX}MDd ssleay32MDd ssleay32 ssl
PATHS PATHS
${OPENSSL_ROOT_DIR}/lib/VC ${OPENSSL_ROOT_DIR}/lib/VC
) )
FIND_LIBRARY(SSL_EAY_RELEASE FIND_LIBRARY(SSL_EAY_RELEASE
NAMES NAMES
ssleay32MD ssleay32 ssl libssl${_OPENSSL_MSVC_ARCH_SUFFIX}MD ssleay32MD ssleay32 ssl
PATHS PATHS
${OPENSSL_ROOT_DIR}/lib/VC ${OPENSSL_ROOT_DIR}/lib/VC
) )