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 5636a8971908bd663f148081401cf48725bcf71c (commit)
via 1bf66fed674bc1b7c463bd230f7c66df8aa86e79 (commit)
via 6b575dec8d393c4a38c587ee97afa068eeb4b432 (commit)
from 5f80b1b146e2f39b8998cb49ff734e2fc5bcac91 (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=5636a8971908bd663f148081401cf48725bcf71c
commit 5636a8971908bd663f148081401cf48725bcf71c
Merge: 5f80b1b 1bf66fe
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Oct 6 11:58:19 2015 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Tue Oct 6 11:58:19 2015 -0400
Merge topic 'FindOpenSSL-mingw' into next
1bf66fed FindOpenSSL: Search for unix-named libraries first on MinGW
(#15765)
6b575dec FindOpenSSL: Tolerate tabs in header while parsing version (#15765)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1bf66fed674bc1b7c463bd230f7c66df8aa86e79
commit 1bf66fed674bc1b7c463bd230f7c66df8aa86e79
Author: Wayne Stambaugh <stambau...@gmail.com>
AuthorDate: Sat Oct 3 11:40:00 2015 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Tue Oct 6 11:55:46 2015 -0400
FindOpenSSL: Search for unix-named libraries first on MinGW (#15765)
Generalize the change made by commit v2.8.10~228^2~4 (FindOpenSSL: find
cross-compiled OpenSSL from MinGW, 2012-07-23) to be used on builds
hosted on Windows too. When building for MinGW, consider library names
that come with MinGW before looking for the main Windows distribution of
OpenSSL.
diff --git a/Modules/FindOpenSSL.cmake b/Modules/FindOpenSSL.cmake
index 3aea695..8b4b988 100644
--- a/Modules/FindOpenSSL.cmake
+++ b/Modules/FindOpenSSL.cmake
@@ -200,12 +200,8 @@ if(WIN32 AND NOT CYGWIN)
set(OPENSSL_LIBRARIES ${SSL_EAY_LIBRARY} ${LIB_EAY_LIBRARY} )
elseif(MINGW)
# same player, for MinGW
- set(LIB_EAY_NAMES libeay32)
- set(SSL_EAY_NAMES ssleay32)
- if(CMAKE_CROSSCOMPILING)
- list(APPEND LIB_EAY_NAMES crypto)
- list(APPEND SSL_EAY_NAMES ssl)
- endif()
+ set(LIB_EAY_NAMES crypto libeay32)
+ set(SSL_EAY_NAMES ssl ssleay32)
find_library(LIB_EAY
NAMES
${LIB_EAY_NAMES}
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6b575dec8d393c4a38c587ee97afa068eeb4b432
commit 6b575dec8d393c4a38c587ee97afa068eeb4b432
Author: Wayne Stambaugh <stambau...@gmail.com>
AuthorDate: Sat Oct 3 11:40:00 2015 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Tue Oct 6 11:50:32 2015 -0400
FindOpenSSL: Tolerate tabs in header while parsing version (#15765)
Tolerate tabs instead of spaces in the "# define" line.
diff --git a/Modules/FindOpenSSL.cmake b/Modules/FindOpenSSL.cmake
index a0f4c52..3aea695 100644
--- a/Modules/FindOpenSSL.cmake
+++ b/Modules/FindOpenSSL.cmake
@@ -325,7 +325,7 @@ endfunction()
if (OPENSSL_INCLUDE_DIR)
if(OPENSSL_INCLUDE_DIR AND EXISTS
"${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h")
file(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h"
openssl_version_str
- REGEX "^# *define[\t ]+OPENSSL_VERSION_NUMBER[\t
]+0x([0-9a-fA-F])+.*")
+ REGEX "^#[\t ]*define[\t ]+OPENSSL_VERSION_NUMBER[\t
]+0x([0-9a-fA-F])+.*")
# The version number is encoded as 0xMNNFFPPS: major minor fix patch status
# The status gives if this is a developer or prerelease and is ignored
here.
-----------------------------------------------------------------------
Summary of changes:
Modules/FindOpenSSL.cmake | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
