Cleanup FindOpenSSL. Add support for win64 installation.
This commit is contained in:
parent
b9e227af84
commit
b3cb794fec
|
@ -1,6 +1,9 @@
|
||||||
# - Try to find the OpenSSL encryption library
|
# - Try to find the OpenSSL encryption library
|
||||||
# Once done this will define
|
# Once done this will define
|
||||||
#
|
#
|
||||||
|
# OPENSSL_ROOT_DIR - Set this variable to the root installation of OpenSSL
|
||||||
|
#
|
||||||
|
# Read-Only variables:
|
||||||
# OPENSSL_FOUND - system has the OpenSSL library
|
# OPENSSL_FOUND - system has the OpenSSL library
|
||||||
# OPENSSL_INCLUDE_DIR - the OpenSSL include directory
|
# OPENSSL_INCLUDE_DIR - the OpenSSL include directory
|
||||||
# OPENSSL_LIBRARIES - The libraries needed to use OpenSSL
|
# OPENSSL_LIBRARIES - The libraries needed to use OpenSSL
|
||||||
|
@ -8,7 +11,7 @@
|
||||||
#=============================================================================
|
#=============================================================================
|
||||||
# Copyright 2006-2009 Kitware, Inc.
|
# Copyright 2006-2009 Kitware, Inc.
|
||||||
# Copyright 2006 Alexander Neundorf <neundorf@kde.org>
|
# Copyright 2006 Alexander Neundorf <neundorf@kde.org>
|
||||||
# Copyright 2009 Mathieu Malaterre <mathieu.malaterre@gmail.com>
|
# Copyright 2009-2010 Mathieu Malaterre <mathieu.malaterre@gmail.com>
|
||||||
#
|
#
|
||||||
# Distributed under the OSI-approved BSD License (the "License");
|
# Distributed under the OSI-approved BSD License (the "License");
|
||||||
# see accompanying file Copyright.txt for details.
|
# see accompanying file Copyright.txt for details.
|
||||||
|
@ -21,8 +24,23 @@
|
||||||
# License text for the above reference.)
|
# License text for the above reference.)
|
||||||
|
|
||||||
# http://www.slproweb.com/products/Win32OpenSSL.html
|
# http://www.slproweb.com/products/Win32OpenSSL.html
|
||||||
|
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]"
|
||||||
|
)
|
||||||
|
SET(_OPENSSL_ROOT_PATHS
|
||||||
|
"C:/OpenSSL/"
|
||||||
|
)
|
||||||
|
FIND_PATH(OPENSSL_ROOT_DIR
|
||||||
|
NAMES include/openssl/ssl.h
|
||||||
|
HINTS ${_OPENSSL_HINTS}
|
||||||
|
PATHS ${_OPENSSL_PATHS}
|
||||||
|
)
|
||||||
|
MARK_AS_ADVANCED(OPENSSL_ROOT_DIR)
|
||||||
|
|
||||||
|
# Re-use the previous path:
|
||||||
FIND_PATH(OPENSSL_INCLUDE_DIR openssl/ssl.h
|
FIND_PATH(OPENSSL_INCLUDE_DIR openssl/ssl.h
|
||||||
PATHS "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (32-bit)_is1;Inno Setup: App Path]/include"
|
${OPENSSL_ROOT_DIR}/include
|
||||||
)
|
)
|
||||||
|
|
||||||
IF(WIN32 AND NOT CYGWIN)
|
IF(WIN32 AND NOT CYGWIN)
|
||||||
|
@ -43,16 +61,16 @@ 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
|
||||||
FIND_LIBRARY(LIB_EAY_DEBUG NAMES libeay32MDd libeay32
|
FIND_LIBRARY(LIB_EAY_DEBUG NAMES libeay32MDd libeay32
|
||||||
PATHS "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (32-bit)_is1;Inno Setup: App Path]/lib/VC"
|
${OPENSSL_ROOT_DIR}/lib/VC
|
||||||
)
|
)
|
||||||
FIND_LIBRARY(LIB_EAY_RELEASE NAMES libeay32MD libeay32
|
FIND_LIBRARY(LIB_EAY_RELEASE NAMES libeay32MD libeay32
|
||||||
PATHS "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (32-bit)_is1;Inno Setup: App Path]/lib/VC"
|
${OPENSSL_ROOT_DIR}/lib/VC
|
||||||
)
|
)
|
||||||
FIND_LIBRARY(SSL_EAY_DEBUG NAMES ssleay32MDd ssleay32 ssl
|
FIND_LIBRARY(SSL_EAY_DEBUG NAMES ssleay32MDd ssleay32 ssl
|
||||||
PATHS "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (32-bit)_is1;Inno Setup: App Path]/lib/VC"
|
${OPENSSL_ROOT_DIR}/lib/VC
|
||||||
)
|
)
|
||||||
FIND_LIBRARY(SSL_EAY_RELEASE NAMES ssleay32MD ssleay32 ssl
|
FIND_LIBRARY(SSL_EAY_RELEASE NAMES ssleay32MD ssleay32 ssl
|
||||||
PATHS "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (32-bit)_is1;Inno Setup: App Path]/lib/VC"
|
${OPENSSL_ROOT_DIR}/lib/VC
|
||||||
)
|
)
|
||||||
if( CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE )
|
if( CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE )
|
||||||
set( OPENSSL_LIBRARIES
|
set( OPENSSL_LIBRARIES
|
||||||
|
@ -67,20 +85,20 @@ IF(WIN32 AND NOT CYGWIN)
|
||||||
ELSEIF(MINGW)
|
ELSEIF(MINGW)
|
||||||
# same player, for MingW
|
# same player, for MingW
|
||||||
FIND_LIBRARY(LIB_EAY NAMES libeay32
|
FIND_LIBRARY(LIB_EAY NAMES libeay32
|
||||||
PATHS "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (32-bit)_is1;Inno Setup: App Path]/lib/MinGW"
|
${OPENSSL_ROOT_DIR}/lib/MinGW
|
||||||
)
|
)
|
||||||
FIND_LIBRARY(SSL_EAY NAMES ssleay32
|
FIND_LIBRARY(SSL_EAY NAMES ssleay32
|
||||||
PATHS "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (32-bit)_is1;Inno Setup: App Path]/lib/MinGW"
|
${OPENSSL_ROOT_DIR}/lib/MinGW
|
||||||
)
|
)
|
||||||
MARK_AS_ADVANCED(SSL_EAY LIB_EAY)
|
MARK_AS_ADVANCED(SSL_EAY LIB_EAY)
|
||||||
set( OPENSSL_LIBRARIES ${SSL_EAY} ${LIB_EAY} )
|
set( OPENSSL_LIBRARIES ${SSL_EAY} ${LIB_EAY} )
|
||||||
ELSE(MSVC)
|
ELSE(MSVC)
|
||||||
# Not sure what to pick for -say- intel, let's use the toplevel ones and hope someone report issues:
|
# Not sure what to pick for -say- intel, let's use the toplevel ones and hope someone report issues:
|
||||||
FIND_LIBRARY(LIB_EAY NAMES libeay32
|
FIND_LIBRARY(LIB_EAY NAMES libeay32
|
||||||
PATHS "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (32-bit)_is1;Inno Setup: App Path]/lib"
|
${OPENSSL_ROOT_DIR}/lib
|
||||||
)
|
)
|
||||||
FIND_LIBRARY(SSL_EAY NAMES ssleay32
|
FIND_LIBRARY(SSL_EAY NAMES ssleay32
|
||||||
PATHS "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (32-bit)_is1;Inno Setup: App Path]/lib"
|
${OPENSSL_ROOT_DIR}/lib
|
||||||
)
|
)
|
||||||
MARK_AS_ADVANCED(SSL_EAY LIB_EAY)
|
MARK_AS_ADVANCED(SSL_EAY LIB_EAY)
|
||||||
set( OPENSSL_LIBRARIES ${SSL_EAY} ${LIB_EAY} )
|
set( OPENSSL_LIBRARIES ${SSL_EAY} ${LIB_EAY} )
|
||||||
|
|
Loading…
Reference in New Issue