[Cmake-commits] CMake branch, next, updated. v2.8.8-3569-g832059f

[Andreas Schneider]

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  832059fb00d9833fbfe3e756e2cd217de56ef5ef (commit)
       via  64a0162b45f47983d5c8d517b74e52928ab4930a (commit)
       via  cac490aa70cf4564178be033bf8ca76d9e15455e (commit)
       via  e5126cf405b1eb3bbc97a273eee62327e0131165 (commit)
      from  a3218221c341b84193cd01f878619a8b7eacac9d (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=832059fb00d9833fbfe3e756e2cd217de56ef5ef
commit 832059fb00d9833fbfe3e756e2cd217de56ef5ef
Merge: a321822 64a0162
Author:     Andreas Schneider <asn at cryptomilk.org>
AuthorDate: Thu Jul 26 04:48:10 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jul 26 04:48:10 2012 -0400

    Merge topic 'asn_openssl_cross_cc' into next
    
    64a0162 FindOpenSSL: find cross-compiled OpenSSL from MinGW (#13431)
    cac490a CMake Nightly Date Stamp
    e5126cf CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=64a0162b45f47983d5c8d517b74e52928ab4930a
commit 64a0162b45f47983d5c8d517b74e52928ab4930a
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Mon Jul 23 20:34:48 2012 +0200
Commit:     Andreas Schneider <asn at cryptomilk.org>
CommitDate: Thu Jul 26 10:38:24 2012 +0200

    FindOpenSSL: find cross-compiled OpenSSL from MinGW (#13431)
    
    Suggested-by: Dominik Schmidt <dev at dominik-schmidt.de>
    
    Signed-off-by: Andreas Schneider <asn at cryptomilk.org>

diff --git a/Modules/FindOpenSSL.cmake b/Modules/FindOpenSSL.cmake
index d1fc2d2..c19667d 100644
--- a/Modules/FindOpenSSL.cmake
+++ b/Modules/FindOpenSSL.cmake
@@ -134,9 +134,15 @@ IF(WIN32 AND NOT CYGWIN)
     MARK_AS_ADVANCED(LIB_EAY_DEBUG LIB_EAY_RELEASE)
   ELSEIF(MINGW)
     # same player, for MingW
+    SET(LIB_EAY_NAMES libeay32)
+    SET(SSL_EAY_NAMES ssleay32)
+    IF(CMAKE_CROSS_COMPILING)
+      LIST(APPEND LIB_EAY_NAMES crypto)
+      LIST(APPEND SSL_EAY_NAMES ssl)
+    ENDIF()
     FIND_LIBRARY(LIB_EAY
       NAMES
-        libeay32
+        ${LIB_EAY_NAMES}
       ${_OPENSSL_ROOT_HINTS_AND_PATHS}
       PATH_SUFFIXES
         "lib"
@@ -145,7 +151,7 @@ IF(WIN32 AND NOT CYGWIN)
 
     FIND_LIBRARY(SSL_EAY
       NAMES
-        ssleay32
+        ${SSL_EAY_NAMES}
       ${_OPENSSL_ROOT_HINTS_AND_PATHS}
       PATH_SUFFIXES
         "lib"
@@ -154,6 +160,8 @@ IF(WIN32 AND NOT CYGWIN)
 
     MARK_AS_ADVANCED(SSL_EAY LIB_EAY)
     set( OPENSSL_LIBRARIES ${SSL_EAY} ${LIB_EAY} )
+    unset(LIB_EAY_NAMES)
+    unset(SSL_EAY_NAMES)
   ELSE(MSVC)
     # Not sure what to pick for -say- intel, let's use the toplevel ones and hope someone report issues:
     FIND_LIBRARY(LIB_EAY

-----------------------------------------------------------------------

Summary of changes:
 Modules/FindOpenSSL.cmake |   12 ++++++++++--
 Source/CMakeVersion.cmake |    2 +-
 2 files changed, 11 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake