[Cmake-commits] CMake branch, next, updated. v2.8.2-280-g9030698

[Mathieu Malaterre]

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  90306982023f838d8754d3ec19f2aede30539a9d (commit)
       via  ca5c5221b71c6767175348c0d9a6ec6012d9dfe6 (commit)
       via  13d686331e5bf410290dee530051987161173d86 (commit)
       via  c457288767f606c8e5f7691ba1369543109304a5 (commit)
       via  5cf80768e189cf271a6d8e4a56ead043dbef33e4 (commit)
       via  7ed87c3e3edc359077dec0e5d8c89847df3c535a (commit)
      from  3f68c86f7e4f0ea9dbb095baa4f9676e80a4ea5b (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=90306982023f838d8754d3ec19f2aede30539a9d
commit 90306982023f838d8754d3ec19f2aede30539a9d
Merge: 3f68c86 ca5c522
Author:     Mathieu Malaterre <mathieu.malaterre at gmail.com>
AuthorDate: Tue Jul 27 18:27:14 2010 +0200
Commit:     Mathieu Malaterre <mathieu.malaterre at gmail.com>
CommitDate: Tue Jul 27 18:27:14 2010 +0200

    Merge branch 'findopenssl-path-fix' into next


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ca5c5221b71c6767175348c0d9a6ec6012d9dfe6
commit ca5c5221b71c6767175348c0d9a6ec6012d9dfe6
Author:     Mathieu Malaterre <mathieu.malaterre at gmail.com>
AuthorDate: Tue Jul 27 18:26:55 2010 +0200
Commit:     Mathieu Malaterre <mathieu.malaterre at gmail.com>
CommitDate: Tue Jul 27 18:26:55 2010 +0200

    Add missing PATHS to find_path commands to fix openssl searching

diff --git a/Modules/FindOpenSSL.cmake b/Modules/FindOpenSSL.cmake
index 826ae09..bf47ab8 100644
--- a/Modules/FindOpenSSL.cmake
+++ b/Modules/FindOpenSSL.cmake
@@ -40,7 +40,7 @@ MARK_AS_ADVANCED(OPENSSL_ROOT_DIR)
 
 # Re-use the previous path:
 FIND_PATH(OPENSSL_INCLUDE_DIR openssl/ssl.h
-  ${OPENSSL_ROOT_DIR}/include
+  PATHS ${OPENSSL_ROOT_DIR}/include
 )
 
 IF(WIN32 AND NOT CYGWIN)
@@ -61,16 +61,16 @@ IF(WIN32 AND NOT CYGWIN)
     # libeay32MD.lib is identical to ../libeay32.lib, and
     # ssleay32MD.lib is identical to ../ssleay32.lib
     FIND_LIBRARY(LIB_EAY_DEBUG NAMES libeay32MDd libeay32
-      ${OPENSSL_ROOT_DIR}/lib/VC
+      PATHS ${OPENSSL_ROOT_DIR}/lib/VC
       )
     FIND_LIBRARY(LIB_EAY_RELEASE NAMES libeay32MD libeay32
-      ${OPENSSL_ROOT_DIR}/lib/VC
+      PATHS ${OPENSSL_ROOT_DIR}/lib/VC
       )
     FIND_LIBRARY(SSL_EAY_DEBUG NAMES ssleay32MDd ssleay32 ssl
-      ${OPENSSL_ROOT_DIR}/lib/VC
+      PATHS ${OPENSSL_ROOT_DIR}/lib/VC
       )
     FIND_LIBRARY(SSL_EAY_RELEASE NAMES ssleay32MD ssleay32 ssl
-      ${OPENSSL_ROOT_DIR}/lib/VC
+      PATHS ${OPENSSL_ROOT_DIR}/lib/VC
       )
     if( CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE )
       set( OPENSSL_LIBRARIES
@@ -85,20 +85,20 @@ IF(WIN32 AND NOT CYGWIN)
   ELSEIF(MINGW)
     # same player, for MingW
     FIND_LIBRARY(LIB_EAY NAMES libeay32
-      ${OPENSSL_ROOT_DIR}/lib/MinGW
+      PATHS ${OPENSSL_ROOT_DIR}/lib/MinGW
       )
     FIND_LIBRARY(SSL_EAY NAMES ssleay32
-      ${OPENSSL_ROOT_DIR}/lib/MinGW
+      PATHS ${OPENSSL_ROOT_DIR}/lib/MinGW
       )
     MARK_AS_ADVANCED(SSL_EAY LIB_EAY)
     set( OPENSSL_LIBRARIES ${SSL_EAY} ${LIB_EAY} )
   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 NAMES libeay32
-      ${OPENSSL_ROOT_DIR}/lib
+      PATHS ${OPENSSL_ROOT_DIR}/lib
       )
     FIND_LIBRARY(SSL_EAY NAMES ssleay32
-      ${OPENSSL_ROOT_DIR}/lib
+      PATHS ${OPENSSL_ROOT_DIR}/lib
       )
     MARK_AS_ADVANCED(SSL_EAY LIB_EAY)
     set( OPENSSL_LIBRARIES ${SSL_EAY} ${LIB_EAY} )

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

Summary of changes:
 Modules/FindOpenSSL.cmake         |   18 +++++++++---------
 Source/kwsys/kwsysDateStamp.cmake |    2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
CMake