mirror of
https://github.com/reactos/CMake.git
synced 2024-11-26 04:50:24 +00:00
FIX: BUG: 0008971 FindOpenSSL improvement. Teaches cmake to find openssl on win32. openssl comes with the crypto libs which are the important part of the openssl project.
This commit is contained in:
parent
ae27492091
commit
54541d4a47
@ -8,6 +8,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>
|
||||||
#
|
#
|
||||||
# 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.
|
||||||
@ -27,19 +28,32 @@ IF(SSL_EAY_DEBUG AND SSL_EAY_RELEASE)
|
|||||||
SET(LIB_FOUND 1)
|
SET(LIB_FOUND 1)
|
||||||
ENDIF(SSL_EAY_DEBUG AND SSL_EAY_RELEASE)
|
ENDIF(SSL_EAY_DEBUG AND SSL_EAY_RELEASE)
|
||||||
|
|
||||||
FIND_PATH(OPENSSL_INCLUDE_DIR openssl/ssl.h )
|
# http://www.slproweb.com/products/Win32OpenSSL.html
|
||||||
|
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"
|
||||||
|
)
|
||||||
|
|
||||||
IF(WIN32 AND MSVC)
|
IF(WIN32 AND MSVC)
|
||||||
# /MD and /MDd are the standard values - if somone wants to use
|
# /MD and /MDd are the standard values - if somone wants to use
|
||||||
# others, the libnames have to change here too
|
# others, the libnames have to change here too
|
||||||
# use also ssl and ssleay32 in debug as fallback for openssl < 0.9.8b
|
# use also ssl and ssleay32 in debug as fallback for openssl < 0.9.8b
|
||||||
|
|
||||||
FIND_LIBRARY(SSL_EAY_DEBUG NAMES ssleay32MDd ssl ssleay32)
|
FIND_LIBRARY(LIB_EAY_DEBUG NAMES libeay32MDd libeay32
|
||||||
FIND_LIBRARY(SSL_EAY_RELEASE NAMES ssleay32MD ssl ssleay32)
|
PATHS "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (32-bit)_is1;Inno Setup: App Path]/lib/VC"
|
||||||
|
)
|
||||||
|
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"
|
||||||
|
)
|
||||||
|
FIND_LIBRARY(SSL_EAY_DEBUG NAMES ssleay32MDd ssl ssleay32
|
||||||
|
PATHS "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (32-bit)_is1;Inno Setup: App Path]/lib/VC"
|
||||||
|
)
|
||||||
|
FIND_LIBRARY(SSL_EAY_RELEASE NAMES ssleay32MD ssl ssleay32
|
||||||
|
PATHS "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (32-bit)_is1;Inno Setup: App Path]/lib/VC"
|
||||||
|
)
|
||||||
|
|
||||||
IF(MSVC_IDE)
|
IF(MSVC_IDE)
|
||||||
IF(SSL_EAY_DEBUG AND SSL_EAY_RELEASE)
|
IF(SSL_EAY_DEBUG AND SSL_EAY_RELEASE)
|
||||||
SET(OPENSSL_LIBRARIES optimized ${SSL_EAY_RELEASE} debug ${SSL_EAY_DEBUG})
|
SET(OPENSSL_LIBRARIES optimized ${SSL_EAY_RELEASE} ${LIB_EAY_RELEASE} debug ${SSL_EAY_DEBUG} ${LIB_EAY_DEBUG})
|
||||||
ELSE(SSL_EAY_DEBUG AND SSL_EAY_RELEASE)
|
ELSE(SSL_EAY_DEBUG AND SSL_EAY_RELEASE)
|
||||||
SET(OPENSSL_LIBRARIES NOTFOUND)
|
SET(OPENSSL_LIBRARIES NOTFOUND)
|
||||||
MESSAGE(STATUS "Could not find the debug and release version of openssl")
|
MESSAGE(STATUS "Could not find the debug and release version of openssl")
|
||||||
@ -47,15 +61,20 @@ IF(WIN32 AND MSVC)
|
|||||||
ELSE(MSVC_IDE)
|
ELSE(MSVC_IDE)
|
||||||
STRING(TOLOWER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE_TOLOWER)
|
STRING(TOLOWER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE_TOLOWER)
|
||||||
IF(CMAKE_BUILD_TYPE_TOLOWER MATCHES debug)
|
IF(CMAKE_BUILD_TYPE_TOLOWER MATCHES debug)
|
||||||
SET(OPENSSL_LIBRARIES ${SSL_EAY_DEBUG})
|
SET(OPENSSL_LIBRARIES ${SSL_EAY_DEBUG} ${LIB_EAY_DEBUG})
|
||||||
ELSE(CMAKE_BUILD_TYPE_TOLOWER MATCHES debug)
|
ELSE(CMAKE_BUILD_TYPE_TOLOWER MATCHES debug)
|
||||||
SET(OPENSSL_LIBRARIES ${SSL_EAY_RELEASE})
|
SET(OPENSSL_LIBRARIES ${SSL_EAY_RELEASE} ${LIB_EAY_RELEASE})
|
||||||
ENDIF(CMAKE_BUILD_TYPE_TOLOWER MATCHES debug)
|
ENDIF(CMAKE_BUILD_TYPE_TOLOWER MATCHES debug)
|
||||||
ENDIF(MSVC_IDE)
|
ENDIF(MSVC_IDE)
|
||||||
MARK_AS_ADVANCED(SSL_EAY_DEBUG SSL_EAY_RELEASE)
|
MARK_AS_ADVANCED(SSL_EAY_DEBUG SSL_EAY_RELEASE)
|
||||||
|
MARK_AS_ADVANCED(LIB_EAY_DEBUG LIB_EAY_RELEASE)
|
||||||
ELSE(WIN32 AND MSVC)
|
ELSE(WIN32 AND MSVC)
|
||||||
|
|
||||||
FIND_LIBRARY(OPENSSL_LIBRARIES NAMES ssl ssleay32 ssleay32MD )
|
FIND_LIBRARY(OPENSSL_SSL_LIBRARIES NAMES ssl ssleay32 ssleay32MD)
|
||||||
|
FIND_LIBRARY(OPENSSL_CRYPTO_LIBRARIES NAMES crypto)
|
||||||
|
MARK_AS_ADVANCED(OPENSSL_CRYPTO_LIBRARIES OPENSSL_SSL_LIBRARIES)
|
||||||
|
|
||||||
|
SET(OPENSSL_LIBRARIES ${OPENSSL_SSL_LIBRARIES} ${OPENSSL_CRYPTO_LIBRARIES})
|
||||||
|
|
||||||
ENDIF(WIN32 AND MSVC)
|
ENDIF(WIN32 AND MSVC)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user