[Cmake-commits] CMake branch, next, updated. v2.8.8-3578-g2a190dd
Rolf Eike Beer
eike at sf-mail.de
Sat Jul 28 04:29:10 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 2a190dd059ab8293d989684fe560b898110a2ce8 (commit)
via eb137460c42094f05c28aa86d97621ae608ef234 (commit)
via 379993658dd71223ede39817f3f0e962f76467be (commit)
via f66c82c8ac09e2671f483d27c9b2c214b41ba819 (commit)
via dcd871ba5baa45a7d51f0b42e8c79c4a7f30e06b (commit)
via fb0bcc001cbdff5c28b013c3ee41da36d1a11434 (commit)
via b0e9fd7b255f076960c6c17ce0d3ac4b5c50d4d7 (commit)
via 8b3fd8fb2669131e9e429735fe6173ab2eeaa6d0 (commit)
via 247a5cac245694ebc5bfca712a9c37ff234bd1a8 (commit)
from 832059fb00d9833fbfe3e756e2cd217de56ef5ef (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=2a190dd059ab8293d989684fe560b898110a2ce8
commit 2a190dd059ab8293d989684fe560b898110a2ce8
Merge: 832059f eb13746
Author: Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Sat Jul 28 04:29:09 2012 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Jul 28 04:29:09 2012 -0400
Merge topic 'SelectLibraryConfiguration-multi-lib-per-var' into next
eb13746 SelectLibraryConfiguration: generate correct output when input vars are lists
3799936 Merge branch 'master' of git://cmake.org/cmake
f66c82c CMake Nightly Date Stamp
dcd871b Merge branch 'master' of git://cmake.org/cmake
fb0bcc0 CMake Nightly Date Stamp
b0e9fd7 FindOpenSSL: let CMake handle environment variable HINTS
8b3fd8f FindOpenSSL: use SelectLibraryConfigurations
247a5ca FindOpenSSL: find cross-compiled OpenSSL from MinGW (#13431)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=eb137460c42094f05c28aa86d97621ae608ef234
commit eb137460c42094f05c28aa86d97621ae608ef234
Author: Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Sat Jul 28 10:25:17 2012 +0200
Commit: Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Sat Jul 28 10:25:17 2012 +0200
SelectLibraryConfiguration: generate correct output when input vars are lists
In case that any of the input variables that hold the library names contains
more than just a single library the "debug" or "optimized" keywords were only
prepended to the first item, making all other libs appear in all
configurations. Just treat both input variables as lists.
Thanks to Philipp Berger <newsletters at philippberger.de> for pointing me at
this.
diff --git a/Modules/SelectLibraryConfigurations.cmake b/Modules/SelectLibraryConfigurations.cmake
index 2e8ade0..e05dc8e 100644
--- a/Modules/SelectLibraryConfigurations.cmake
+++ b/Modules/SelectLibraryConfigurations.cmake
@@ -48,17 +48,19 @@ macro( select_library_configurations basename )
# if only the debug version was found, set the release value to be the
# debug value.
_set_library_name( ${basename} DEBUG RELEASE )
- if (${basename}_LIBRARY_DEBUG AND ${basename}_LIBRARY_RELEASE AND
- NOT ${basename}_LIBRARY_DEBUG STREQUAL ${basename}_LIBRARY_RELEASE)
+ if( ${basename}_LIBRARY_DEBUG AND ${basename}_LIBRARY_RELEASE AND
+ NOT ${basename}_LIBRARY_DEBUG STREQUAL ${basename}_LIBRARY_RELEASE )
# if the generator supports configuration types or CMAKE_BUILD_TYPE
# is set, then set optimized and debug options.
if( CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE )
- set( ${basename}_LIBRARY
- optimized ${${basename}_LIBRARY_RELEASE}
- debug ${${basename}_LIBRARY_DEBUG} )
- set( ${basename}_LIBRARIES
- optimized ${${basename}_LIBRARY_RELEASE}
- debug ${${basename}_LIBRARY_DEBUG} )
+ set( ${basename}_LIBRARY )
+ foreach( _libname LISTS ${basename}_LIBRARY_RELEASE )
+ list( APPEND ${basename}_LIBRARY optimized "${_libname}" )
+ endforach()
+ foreach( _libname LISTS ${basename}_LIBRARY_DEBUG )
+ list( APPEND ${basename}_LIBRARY debug "${_libname}" )
+ endforach()
+ set( ${basename}_LIBRARIES "${${basename}_LIBRARY}" )
else( CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE )
# If there are no configuration types or build type, just use
# the release version
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=379993658dd71223ede39817f3f0e962f76467be
commit 379993658dd71223ede39817f3f0e962f76467be
Merge: dcd871b f66c82c
Author: Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Sat Jul 28 10:24:29 2012 +0200
Commit: Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Sat Jul 28 10:24:29 2012 +0200
Merge branch 'master' of git://cmake.org/cmake
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dcd871ba5baa45a7d51f0b42e8c79c4a7f30e06b
commit dcd871ba5baa45a7d51f0b42e8c79c4a7f30e06b
Merge: b0e9fd7 fb0bcc0
Author: Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Fri Jul 27 17:42:02 2012 +0200
Commit: Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Fri Jul 27 17:42:02 2012 +0200
Merge branch 'master' of git://cmake.org/cmake
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b0e9fd7b255f076960c6c17ce0d3ac4b5c50d4d7
commit b0e9fd7b255f076960c6c17ce0d3ac4b5c50d4d7
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: Mon Jul 23 21:33:08 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=8b3fd8fb2669131e9e429735fe6173ab2eeaa6d0
commit 8b3fd8fb2669131e9e429735fe6173ab2eeaa6d0
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: Mon Jul 23 21:33:08 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=247a5cac245694ebc5bfca712a9c37ff234bd1a8
commit 247a5cac245694ebc5bfca712a9c37ff234bd1a8
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: Mon Jul 23 21:33:08 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:
Modules/FindOpenSSL.cmake | 20 ++++++--------------
Modules/SelectLibraryConfigurations.cmake | 18 ++++++++++--------
Source/CMakeVersion.cmake | 2 +-
3 files changed, 17 insertions(+), 23 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list