[Cmake-commits] CMake branch, next, updated. v3.8.0-rc1-211-g0823533
Brad King
brad.king at kitware.com
Thu Feb 16 13:27:12 EST 2017
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 0823533dd339ef714c0d0efbc8321bafec48c501 (commit)
via 9b78dca3a909ce3161d235718f935bf2fb9b7f64 (commit)
from ed67fe7451a5ebdf179bbfc5c2517f0e19e651d6 (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=0823533dd339ef714c0d0efbc8321bafec48c501
commit 0823533dd339ef714c0d0efbc8321bafec48c501
Merge: ed67fe7 9b78dca
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Feb 16 13:27:11 2017 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Feb 16 13:27:11 2017 -0500
Merge topic 'FindOpenSSL-crypto-name' into next
9b78dca3 FindOpenSSL: Add another name for libcrypto with MSVC
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9b78dca3a909ce3161d235718f935bf2fb9b7f64
commit 9b78dca3a909ce3161d235718f935bf2fb9b7f64
Author: Kevin Whitaker <eyecreate at gmail.com>
AuthorDate: Thu Feb 16 09:38:30 2017 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Feb 16 13:26:42 2017 -0500
FindOpenSSL: Add another name for libcrypto with MSVC
Add the `crypto` name without any prefix or suffix as a fallback, just
as we already have for `ssl`.
diff --git a/Modules/FindOpenSSL.cmake b/Modules/FindOpenSSL.cmake
index 6259ce1..117811c 100644
--- a/Modules/FindOpenSSL.cmake
+++ b/Modules/FindOpenSSL.cmake
@@ -160,6 +160,7 @@ if(WIN32 AND NOT CYGWIN)
libcrypto
libeay32${_OPENSSL_MSVC_RT_MODE}
libeay32
+ crypto
NAMES_PER_DIR
${_OPENSSL_ROOT_HINTS_AND_PATHS}
PATH_SUFFIXES
-----------------------------------------------------------------------
Summary of changes:
Modules/FindOpenSSL.cmake | 1 +
1 file changed, 1 insertion(+)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list