This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 0287d41c435914431fee29ce064a480c5eb59174 (commit)
via 696339a9d571ff7d37222296164dd738a6a2b042 (commit)
from 44c85ae38a4401379c411a1e3fefce8aefce0eed (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0287d41c435914431fee29ce064a480c5eb59174
commit 0287d41c435914431fee29ce064a480c5eb59174
Merge: 44c85ae 696339a
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Jan 10 13:43:36 2017 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Tue Jan 10 13:43:36 2017 -0500
Merge topic 'FindOpenSSL-check-both' into next
696339a9 FindOpenSSL: Check that both CRYPTO and SSL libraries are present
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=696339a9d571ff7d37222296164dd738a6a2b042
commit 696339a9d571ff7d37222296164dd738a6a2b042
Author: Harry Mallon <ha...@codexdigital.com>
AuthorDate: Tue Jan 3 19:10:53 2017 +0000
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Tue Jan 10 13:42:48 2017 -0500
FindOpenSSL: Check that both CRYPTO and SSL libraries are present
* Strawberry perl on Windows installs one that is found by the
default finder
While at it, de-duplicate code setting `OPENSSL_LIBRARIES`.
diff --git a/Modules/FindOpenSSL.cmake b/Modules/FindOpenSSL.cmake
index 30fc5c6..6259ce1 100644
--- a/Modules/FindOpenSSL.cmake
+++ b/Modules/FindOpenSSL.cmake
@@ -204,7 +204,6 @@ if(WIN32 AND NOT CYGWIN)
SSL_EAY_LIBRARY_DEBUG SSL_EAY_LIBRARY_RELEASE)
set(OPENSSL_SSL_LIBRARY ${SSL_EAY_LIBRARY} )
set(OPENSSL_CRYPTO_LIBRARY ${LIB_EAY_LIBRARY} )
- set(OPENSSL_LIBRARIES ${SSL_EAY_LIBRARY} ${LIB_EAY_LIBRARY} )
elseif(MINGW)
# same player, for MinGW
set(LIB_EAY_NAMES crypto libeay32)
@@ -232,7 +231,6 @@ if(WIN32 AND NOT CYGWIN)
mark_as_advanced(SSL_EAY LIB_EAY)
set(OPENSSL_SSL_LIBRARY ${SSL_EAY} )
set(OPENSSL_CRYPTO_LIBRARY ${LIB_EAY} )
- set(OPENSSL_LIBRARIES ${SSL_EAY} ${LIB_EAY} )
unset(LIB_EAY_NAMES)
unset(SSL_EAY_NAMES)
else()
@@ -264,7 +262,6 @@ if(WIN32 AND NOT CYGWIN)
mark_as_advanced(SSL_EAY LIB_EAY)
set(OPENSSL_SSL_LIBRARY ${SSL_EAY} )
set(OPENSSL_CRYPTO_LIBRARY ${LIB_EAY} )
- set(OPENSSL_LIBRARIES ${SSL_EAY} ${LIB_EAY} )
endif()
else()
@@ -298,8 +295,6 @@ else()
set(OPENSSL_SSL_LIBRARIES ${OPENSSL_SSL_LIBRARY})
set(OPENSSL_CRYPTO_LIBRARIES ${OPENSSL_CRYPTO_LIBRARY})
- set(OPENSSL_LIBRARIES ${OPENSSL_SSL_LIBRARY} ${OPENSSL_CRYPTO_LIBRARY})
-
endif()
function(from_hex HEX DEC)
@@ -371,10 +366,13 @@ endif ()
include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
+set(OPENSSL_LIBRARIES ${OPENSSL_SSL_LIBRARY} ${OPENSSL_CRYPTO_LIBRARY} )
+
if (OPENSSL_VERSION)
find_package_handle_standard_args(OpenSSL
REQUIRED_VARS
- OPENSSL_LIBRARIES
+ OPENSSL_SSL_LIBRARY
+ OPENSSL_CRYPTO_LIBRARY
OPENSSL_INCLUDE_DIR
VERSION_VAR
OPENSSL_VERSION
@@ -383,7 +381,8 @@ if (OPENSSL_VERSION)
)
else ()
find_package_handle_standard_args(OpenSSL "Could NOT find OpenSSL, try to
set the path to OpenSSL root folder in the system variable OPENSSL_ROOT_DIR"
- OPENSSL_LIBRARIES
+ OPENSSL_SSL_LIBRARY
+ OPENSSL_CRYPTO_LIBRARY
OPENSSL_INCLUDE_DIR
)
endif ()
-----------------------------------------------------------------------
Summary of changes:
Modules/FindOpenSSL.cmake | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
