From a091ba61ceec68069be8416d8c96571b16491f3a Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Mon, 28 Mar 2011 18:42:20 +0200 Subject: [PATCH] FindOpenSSL: Fixed crypto und ssl variable names. --- Modules/FindOpenSSL.cmake | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/Modules/FindOpenSSL.cmake b/Modules/FindOpenSSL.cmake index 8f2c01945..b854e4263 100644 --- a/Modules/FindOpenSSL.cmake +++ b/Modules/FindOpenSSL.cmake @@ -183,7 +183,7 @@ IF(WIN32 AND NOT CYGWIN) ENDIF(MSVC) ELSE(WIN32 AND NOT CYGWIN) - FIND_LIBRARY(OPENSSL_SSL_LIBRARIES + FIND_LIBRARY(OPENSSL_SSL_LIBRARY NAMES ssl ssleay32 @@ -195,7 +195,7 @@ ELSE(WIN32 AND NOT CYGWIN) lib ) - FIND_LIBRARY(OPENSSL_CRYPTO_LIBRARIES + FIND_LIBRARY(OPENSSL_CRYPTO_LIBRARY NAMES crypto HINTS @@ -205,9 +205,13 @@ ELSE(WIN32 AND NOT CYGWIN) lib ) - MARK_AS_ADVANCED(OPENSSL_CRYPTO_LIBRARIES OPENSSL_SSL_LIBRARIES) + MARK_AS_ADVANCED(OPENSSL_CRYPTO_LIBRARY OPENSSL_SSL_LIBRARY) - SET(OPENSSL_LIBRARIES ${OPENSSL_SSL_LIBRARIES} ${OPENSSL_CRYPTO_LIBRARIES}) + # compat defines + SET(OPENSSL_SSL_LIBRARIES ${OPENSSL_SSL_LIBRARY}) + SET(OPENSSL_CRYPTO_LIBRARIES ${OPENSSL_CRYPTO_LIBRARY}) + + SET(OPENSSL_LIBRARIES ${OPENSSL_SSL_LIBRARY} ${OPENSSL_CRYPTO_LIBRARY}) ENDIF(WIN32 AND NOT CYGWIN)