[Cmake-commits] CMake branch, next, updated. v2.8.8-3586-gf751732
Rolf Eike Beer
eike at sf-mail.de
Sun Jul 29 10:54:13 EDT 2012
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 f751732d14939f276141ac8645638f628d04b93f (commit)
via c78a7d11dd1eda50ce69566cc74311dde218839c (commit)
via 7464519304636703e2b08a1b89f2d9069d8eb096 (commit)
via 4b793ad1965579836a05a5d55b6ff30849909928 (commit)
via aedc2251fef38450dd1dbc217c291d1a9ab0b4f6 (commit)
from 185faf5db13866d04407d1c01b933b4330d235cd (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=f751732d14939f276141ac8645638f628d04b93f
commit f751732d14939f276141ac8645638f628d04b93f
Merge: 185faf5 c78a7d1
Author: Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Sun Jul 29 10:54:06 2012 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Jul 29 10:54:06 2012 -0400
Merge topic 'FindOpenSSL-improve' into next
c78a7d1 FindOpenSSL: let CMake handle environment variable HINTS
7464519 FindOpenSSL: use SelectLibraryConfigurations
4b793ad FindOpenSSL: find cross-compiled OpenSSL from MinGW (#13431)
aedc225 CMake Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c78a7d11dd1eda50ce69566cc74311dde218839c
commit c78a7d11dd1eda50ce69566cc74311dde218839c
Author: Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Mon Jul 23 21:02:43 2012 +0200
Commit: Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Sun Jul 29 16:53:39 2012 +0200
FindOpenSSL: let CMake handle environment variable HINTS
This will automatically make sure the paths will get recoded to proper separators on Windows
diff --git a/Modules/FindOpenSSL.cmake b/Modules/FindOpenSSL.cmake
index bd46c9f..652ce05 100644
--- a/Modules/FindOpenSSL.cmake
+++ b/Modules/FindOpenSSL.cmake
@@ -31,10 +31,10 @@ endif (UNIX)
# http://www.slproweb.com/products/Win32OpenSSL.html
SET(_OPENSSL_ROOT_HINTS
- $ENV{OPENSSL_ROOT_DIR}
${OPENSSL_ROOT_DIR}
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (32-bit)_is1;Inno Setup: App Path]"
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (64-bit)_is1;Inno Setup: App Path]"
+ ENV OPENSSL_ROOT_DIR
)
SET(_OPENSSL_ROOT_PATHS
"$ENV{PROGRAMFILES}/OpenSSL"
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7464519304636703e2b08a1b89f2d9069d8eb096
commit 7464519304636703e2b08a1b89f2d9069d8eb096
Author: Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Mon Jul 23 21:00:40 2012 +0200
Commit: Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Sun Jul 29 16:53:39 2012 +0200
FindOpenSSL: use SelectLibraryConfigurations
diff --git a/Modules/FindOpenSSL.cmake b/Modules/FindOpenSSL.cmake
index c19667d..bd46c9f 100644
--- a/Modules/FindOpenSSL.cmake
+++ b/Modules/FindOpenSSL.cmake
@@ -79,7 +79,6 @@ IF(WIN32 AND NOT CYGWIN)
FIND_LIBRARY(LIB_EAY_DEBUG
NAMES
libeay32MDd
- libeay32
${_OPENSSL_ROOT_HINTS_AND_PATHS}
PATH_SUFFIXES
"lib"
@@ -101,8 +100,6 @@ IF(WIN32 AND NOT CYGWIN)
FIND_LIBRARY(SSL_EAY_DEBUG
NAMES
ssleay32MDd
- ssleay32
- ssl
${_OPENSSL_ROOT_HINTS_AND_PATHS}
PATH_SUFFIXES
"lib"
@@ -122,16 +119,11 @@ IF(WIN32 AND NOT CYGWIN)
"lib/VC"
)
- if( CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE )
- set( OPENSSL_LIBRARIES
- optimized ${SSL_EAY_RELEASE} debug ${SSL_EAY_DEBUG}
- optimized ${LIB_EAY_RELEASE} debug ${LIB_EAY_DEBUG}
- )
- else()
- set( OPENSSL_LIBRARIES ${SSL_EAY_RELEASE} ${LIB_EAY_RELEASE} )
- endif()
- MARK_AS_ADVANCED(SSL_EAY_DEBUG SSL_EAY_RELEASE)
- MARK_AS_ADVANCED(LIB_EAY_DEBUG LIB_EAY_RELEASE)
+ include(${CMAKE_CURRENT_LIST_DIR}/SelectLibraryConfigurations.cmake)
+ select_library_configurations(LIB_EAY)
+ select_library_configurations(SSL_EAY)
+
+ set( OPENSSL_LIBRARIES ${SSL_EAY_LIBRARY} ${LIB_EAY_LIBRARY} )
ELSEIF(MINGW)
# same player, for MingW
SET(LIB_EAY_NAMES libeay32)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4b793ad1965579836a05a5d55b6ff30849909928
commit 4b793ad1965579836a05a5d55b6ff30849909928
Author: Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Mon Jul 23 20:34:48 2012 +0200
Commit: Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Sun Jul 29 16:53:39 2012 +0200
FindOpenSSL: find cross-compiled OpenSSL from MinGW (#13431)
Suggested-by: Dominik Schmidt <dev at dominik-schmidt.de>
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:
Source/CMakeVersion.cmake | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list