[Cmake-commits] CMake branch, next, updated. v2.8.4-1292-g35627e6
Brad King
brad.king at kitware.com
Thu Mar 31 09:17:15 EDT 2011
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 35627e66e83400a239759e3d50fc913b5f226b87 (commit)
via 112f1dd7e36b9ce398e7082b48a3770e18b04f94 (commit)
via a091ba61ceec68069be8416d8c96571b16491f3a (commit)
via a164649f9d4664e192b421d5b72f8bcfaacd7a16 (commit)
via 0fb5142e40a5a1d13478477af29a6d1a79a8b40e (commit)
from a72ffcf60207f060c2767a835d46d3b59a86da6e (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=35627e66e83400a239759e3d50fc913b5f226b87
commit 35627e66e83400a239759e3d50fc913b5f226b87
Merge: a72ffcf 112f1dd
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Mar 31 09:17:12 2011 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Mar 31 09:17:12 2011 -0400
Merge topic 'asn_openssl_fixes' into next
112f1dd FindOpenSSL: Use find_package_handle_standard_args for version check.
a091ba6 FindOpenSSL: Fixed crypto und ssl variable names.
a164649 FindOpenSSL: We should only use hints to find OpenSSL.
0fb5142 FindOpenSSL: Added support for pkg-config.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=112f1dd7e36b9ce398e7082b48a3770e18b04f94
commit 112f1dd7e36b9ce398e7082b48a3770e18b04f94
Author: Andreas Schneider <asn at cryptomilk.org>
AuthorDate: Mon Mar 28 18:48:41 2011 +0200
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Mar 31 08:43:24 2011 -0400
FindOpenSSL: Use find_package_handle_standard_args for version check.
diff --git a/Modules/FindOpenSSL.cmake b/Modules/FindOpenSSL.cmake
index b854e42..af799d6 100644
--- a/Modules/FindOpenSSL.cmake
+++ b/Modules/FindOpenSSL.cmake
@@ -215,13 +215,7 @@ ELSE(WIN32 AND NOT CYGWIN)
ENDIF(WIN32 AND NOT CYGWIN)
-include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
-find_package_handle_standard_args(OpenSSL "Could NOT find OpenSSL, try to set the path to OpenSSL root folder in the system variable OPENSSL_ROOT_DIR"
- OPENSSL_LIBRARIES
- OPENSSL_INCLUDE_DIR
-)
-
-IF(OPENSSL_FOUND)
+if (OPENSSL_INCLUDE_DIR)
file(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h" openssl_version_str REGEX "^#define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x[0-9][0-9][0-9][0-9][0-9][0-9].*")
string(REGEX REPLACE "^.*OPENSSL_VERSION_NUMBER[\t ]+0x([0-9]).*$" "\\1" OPENSSL_VERSION_MAJOR "${openssl_version_str}")
@@ -232,19 +226,25 @@ IF(OPENSSL_FOUND)
string(REGEX REPLACE "^0" "" OPENSSL_VERSION_PATCH "${OPENSSL_VERSION_PATCH}")
set(OPENSSL_VERSION "${OPENSSL_VERSION_MAJOR}.${OPENSSL_VERSION_MINOR}.${OPENSSL_VERSION_PATCH}")
+endif (OPENSSL_INCLUDE_DIR)
- if(OpenSSL_FIND_VERSION)
- if(OpenSSL_FIND_VERSION_EXACT AND NOT ${OPENSSL_VERSION} VERSION_EQUAL ${OpenSSL_FIND_VERSION})
- message(FATAL_ERROR "OpenSSL version found (${OPENSSL_VERSION}) does not match the required one (${OpenSSL_FIND_VERSION}), aborting.")
- elseif(${OPENSSL_VERSION} VERSION_LESS ${OpenSSL_FIND_VERSION})
- if(OpenSSL_FIND_REQUIRED)
- message(FATAL_ERROR "OpenSSL version found (${OPENSSL_VERSION}) is less then the minimum required (${OpenSSL_FIND_VERSION}), aborting.")
- else(OpenSSL_FIND_REQUIRED)
- message("OpenSSL version found (${OPENSSL_VERSION}) is less then the minimum required (${OpenSSL_FIND_VERSION}), continue without OpenSSL support.")
- set(OPENSSL_FOUND FALSE)
- endif(OpenSSL_FIND_REQUIRED)
- endif()
- endif(OpenSSL_FIND_VERSION)
-ENDIF (OPENSSL_FOUND)
+include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
+
+if (OPENSSL_VERSION)
+ find_package_handle_standard_args(OpenSSL
+ REQUIRED_VARS
+ OPENSSL_LIBRARIES
+ OPENSSL_INCLUDE_DIR
+ VERSION_VAR
+ OPENSSL_VERSION
+ FAIL_MESSAGE
+ "Could NOT find OpenSSL, try to set the path to OpenSSL root folder in the system variable OPENSSL_ROOT_DIR"
+ )
+else (OPENSSL_VERSION)
+ find_package_handle_standard_args(OpenSSL "Could NOT find OpenSSL, try to set the path to OpenSSL root folder in the system variable OPENSSL_ROOT_DIR"
+ OPENSSL_LIBRARIES
+ OPENSSL_INCLUDE_DIR
+ )
+endif (OPENSSL_VERSION)
MARK_AS_ADVANCED(OPENSSL_INCLUDE_DIR OPENSSL_LIBRARIES)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a091ba61ceec68069be8416d8c96571b16491f3a
commit a091ba61ceec68069be8416d8c96571b16491f3a
Author: Andreas Schneider <asn at cryptomilk.org>
AuthorDate: Mon Mar 28 18:42:20 2011 +0200
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Mar 31 08:43:24 2011 -0400
FindOpenSSL: Fixed crypto und ssl variable names.
diff --git a/Modules/FindOpenSSL.cmake b/Modules/FindOpenSSL.cmake
index 8f2c019..b854e42 100644
--- a/Modules/FindOpenSSL.cmake
+++ b/Modules/FindOpenSSL.cmake
@@ -183,7 +183,7 @@ IF(WIN32 AND NOT CYGWIN)
ENDIF(MSVC)
ELSE(WIN32 AND NOT CYGWIN)
- FIND_LIBRARY(OPENSSL_SSL_LIBRARIES
+ FIND_LIBRARY(OPENSSL_SSL_LIBRARY
NAMES
ssl
ssleay32
@@ -195,7 +195,7 @@ ELSE(WIN32 AND NOT CYGWIN)
lib
)
- FIND_LIBRARY(OPENSSL_CRYPTO_LIBRARIES
+ FIND_LIBRARY(OPENSSL_CRYPTO_LIBRARY
NAMES
crypto
HINTS
@@ -205,9 +205,13 @@ ELSE(WIN32 AND NOT CYGWIN)
lib
)
- MARK_AS_ADVANCED(OPENSSL_CRYPTO_LIBRARIES OPENSSL_SSL_LIBRARIES)
+ MARK_AS_ADVANCED(OPENSSL_CRYPTO_LIBRARY OPENSSL_SSL_LIBRARY)
- SET(OPENSSL_LIBRARIES ${OPENSSL_SSL_LIBRARIES} ${OPENSSL_CRYPTO_LIBRARIES})
+ # compat defines
+ SET(OPENSSL_SSL_LIBRARIES ${OPENSSL_SSL_LIBRARY})
+ SET(OPENSSL_CRYPTO_LIBRARIES ${OPENSSL_CRYPTO_LIBRARY})
+
+ SET(OPENSSL_LIBRARIES ${OPENSSL_SSL_LIBRARY} ${OPENSSL_CRYPTO_LIBRARY})
ENDIF(WIN32 AND NOT CYGWIN)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a164649f9d4664e192b421d5b72f8bcfaacd7a16
commit a164649f9d4664e192b421d5b72f8bcfaacd7a16
Author: Andreas Schneider <asn at cryptomilk.org>
AuthorDate: Mon Mar 28 18:38:45 2011 +0200
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Mar 31 08:43:16 2011 -0400
FindOpenSSL: We should only use hints to find OpenSSL.
diff --git a/Modules/FindOpenSSL.cmake b/Modules/FindOpenSSL.cmake
index 4d0e67f..8f2c019 100644
--- a/Modules/FindOpenSSL.cmake
+++ b/Modules/FindOpenSSL.cmake
@@ -33,27 +33,32 @@ 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]"
)
SET(_OPENSSL_ROOT_PATHS
+ "$ENV{PROGRAMFILES}/OpenSSL"
+ "$ENV{PROGRAMFILES}/OpenSSL-Win32"
+ "$ENV{PROGRAMFILES}/OpenSSL-Win64"
"C:/OpenSSL/"
+ "C:/OpenSSL-Win32/"
+ "C:/OpenSSL-Win64/"
)
-FIND_PATH(OPENSSL_ROOT_DIR
- NAMES include/openssl/ssl.h
+SET(_OPENSSL_ROOT_HINTS_AND_PATHS
HINTS ${_OPENSSL_ROOT_HINTS}
PATHS ${_OPENSSL_ROOT_PATHS}
- ENV OPENSSL_ROOT_DIR
-)
-MARK_AS_ADVANCED(OPENSSL_ROOT_DIR)
+ )
-# Re-use the previous path:
FIND_PATH(OPENSSL_INCLUDE_DIR
NAMES
openssl/ssl.h
- PATHS
+ HINTS
${_OPENSSL_INCLUDEDIR}
- ${OPENSSL_ROOT_DIR}/include
+ ${_OPENSSL_ROOT_HINTS_AND_PATHS}
+ PATH_SUFFIXES
+ include
)
IF(WIN32 AND NOT CYGWIN)
@@ -73,22 +78,52 @@ IF(WIN32 AND NOT CYGWIN)
# We are using the libraries located in the VC subdir instead of the parent directory eventhough :
# libeay32MD.lib is identical to ../libeay32.lib, and
# ssleay32MD.lib is identical to ../ssleay32.lib
- FIND_LIBRARY(LIB_EAY_DEBUG NAMES libeay32MDd libeay32
- PATHS ${OPENSSL_ROOT_DIR}
- PATH_SUFFIXES "lib" "VC" "lib/VC"
- )
- FIND_LIBRARY(LIB_EAY_RELEASE NAMES libeay32MD libeay32
- PATHS ${OPENSSL_ROOT_DIR}
- PATH_SUFFIXES "lib" "VC" "lib/VC"
- )
- FIND_LIBRARY(SSL_EAY_DEBUG NAMES ssleay32MDd ssleay32 ssl
- PATHS ${OPENSSL_ROOT_DIR}
- PATH_SUFFIXES "lib" "VC" "lib/VC"
- )
- FIND_LIBRARY(SSL_EAY_RELEASE NAMES ssleay32MD ssleay32 ssl
- PATHS ${OPENSSL_ROOT_DIR}
- PATH_SUFFIXES "lib" "VC" "lib/VC"
- )
+ FIND_LIBRARY(LIB_EAY_DEBUG
+ NAMES
+ libeay32MDd
+ libeay32
+ ${_OPENSSL_ROOT_HINTS_AND_PATHS}
+ PATH_SUFFIXES
+ "lib"
+ "VC"
+ "lib/VC"
+ )
+
+ FIND_LIBRARY(LIB_EAY_RELEASE
+ NAMES
+ libeay32MD
+ libeay32
+ ${_OPENSSL_ROOT_HINTS_AND_PATHS}
+ PATH_SUFFIXES
+ "lib"
+ "VC"
+ "lib/VC"
+ )
+
+ FIND_LIBRARY(SSL_EAY_DEBUG
+ NAMES
+ ssleay32MDd
+ ssleay32
+ ssl
+ ${_OPENSSL_ROOT_HINTS_AND_PATHS}
+ PATH_SUFFIXES
+ "lib"
+ "VC"
+ "lib/VC"
+ )
+
+ FIND_LIBRARY(SSL_EAY_RELEASE
+ NAMES
+ ssleay32MD
+ ssleay32
+ ssl
+ ${_OPENSSL_ROOT_HINTS_AND_PATHS}
+ PATH_SUFFIXES
+ "lib"
+ "VC"
+ "lib/VC"
+ )
+
if( CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE )
set( OPENSSL_LIBRARIES
optimized ${SSL_EAY_RELEASE} debug ${SSL_EAY_DEBUG}
@@ -101,14 +136,24 @@ IF(WIN32 AND NOT CYGWIN)
MARK_AS_ADVANCED(LIB_EAY_DEBUG LIB_EAY_RELEASE)
ELSEIF(MINGW)
# same player, for MingW
- FIND_LIBRARY(LIB_EAY NAMES libeay32
- PATHS ${OPENSSL_ROOT_DIR}
- PATH_SUFFIXES "lib" "VC" "lib/MinGW"
- )
- FIND_LIBRARY(SSL_EAY NAMES ssleay32
- PATHS ${OPENSSL_ROOT_DIR}
- PATH_SUFFIXES "lib" "VC" "lib/MinGW"
- )
+ FIND_LIBRARY(LIB_EAY
+ NAMES
+ libeay32
+ ${_OPENSSL_ROOT_HINTS_AND_PATHS}
+ PATH_SUFFIXES
+ "lib"
+ "lib/MinGW"
+ )
+
+ FIND_LIBRARY(SSL_EAY
+ NAMES
+ ssleay32
+ ${_OPENSSL_ROOT_HINTS_AND_PATHS}
+ PATH_SUFFIXES
+ "lib"
+ "lib/MinGW"
+ )
+
MARK_AS_ADVANCED(SSL_EAY LIB_EAY)
set( OPENSSL_LIBRARIES ${SSL_EAY} ${LIB_EAY} )
ELSE(MSVC)
@@ -116,17 +161,21 @@ IF(WIN32 AND NOT CYGWIN)
FIND_LIBRARY(LIB_EAY
NAMES
libeay32
- PATHS
+ HINTS
${_OPENSSL_LIBDIR}
- ${OPENSSL_ROOT_DIR}/lib
+ ${_OPENSSL_ROOT_HINTS_AND_PATHS}
+ PATH_SUFFIXES
+ lib
)
FIND_LIBRARY(SSL_EAY
NAMES
ssleay32
- PATHS
+ HINTS
${_OPENSSL_LIBDIR}
- ${OPENSSL_ROOT_DIR}/lib
+ ${_OPENSSL_ROOT_HINTS_AND_PATHS}
+ PATH_SUFFIXES
+ lib
)
MARK_AS_ADVANCED(SSL_EAY LIB_EAY)
@@ -139,15 +188,21 @@ ELSE(WIN32 AND NOT CYGWIN)
ssl
ssleay32
ssleay32MD
- PATHS
+ HINTS
${_OPENSSL_LIBDIR}
+ ${_OPENSSL_ROOT_HINTS_AND_PATHS}
+ PATH_SUFFIXES
+ lib
)
FIND_LIBRARY(OPENSSL_CRYPTO_LIBRARIES
NAMES
crypto
- PATHS
+ HINTS
${_OPENSSL_LIBDIR}
+ ${_OPENSSL_ROOT_HINTS_AND_PATHS}
+ PATH_SUFFIXES
+ lib
)
MARK_AS_ADVANCED(OPENSSL_CRYPTO_LIBRARIES OPENSSL_SSL_LIBRARIES)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0fb5142e40a5a1d13478477af29a6d1a79a8b40e
commit 0fb5142e40a5a1d13478477af29a6d1a79a8b40e
Author: Andreas Schneider <asn at cryptomilk.org>
AuthorDate: Mon Mar 28 18:31:16 2011 +0200
Commit: Andreas Schneider <asn at cryptomilk.org>
CommitDate: Mon Mar 28 18:31:16 2011 +0200
FindOpenSSL: Added support for pkg-config.
diff --git a/Modules/FindOpenSSL.cmake b/Modules/FindOpenSSL.cmake
index c3003c9..4d0e67f 100644
--- a/Modules/FindOpenSSL.cmake
+++ b/Modules/FindOpenSSL.cmake
@@ -24,6 +24,13 @@
# (To distribute this file outside of CMake, substitute the full
# License text for the above reference.)
+if (UNIX)
+ find_package(PkgConfig)
+ if (PKG_CONFIG_FOUND)
+ pkg_check_modules(_OPENSSL openssl)
+ endif (PKG_CONFIG_FOUND)
+endif (UNIX)
+
# http://www.slproweb.com/products/Win32OpenSSL.html
SET(_OPENSSL_ROOT_HINTS
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (32-bit)_is1;Inno Setup: App Path]"
@@ -41,8 +48,12 @@ FIND_PATH(OPENSSL_ROOT_DIR
MARK_AS_ADVANCED(OPENSSL_ROOT_DIR)
# Re-use the previous path:
-FIND_PATH(OPENSSL_INCLUDE_DIR openssl/ssl.h
- PATHS ${OPENSSL_ROOT_DIR}/include
+FIND_PATH(OPENSSL_INCLUDE_DIR
+ NAMES
+ openssl/ssl.h
+ PATHS
+ ${_OPENSSL_INCLUDEDIR}
+ ${OPENSSL_ROOT_DIR}/include
)
IF(WIN32 AND NOT CYGWIN)
@@ -102,19 +113,43 @@ IF(WIN32 AND NOT CYGWIN)
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
- PATHS ${OPENSSL_ROOT_DIR}/lib
- )
- FIND_LIBRARY(SSL_EAY NAMES ssleay32
- PATHS ${OPENSSL_ROOT_DIR}/lib
- )
+ FIND_LIBRARY(LIB_EAY
+ NAMES
+ libeay32
+ PATHS
+ ${_OPENSSL_LIBDIR}
+ ${OPENSSL_ROOT_DIR}/lib
+ )
+
+ FIND_LIBRARY(SSL_EAY
+ NAMES
+ ssleay32
+ PATHS
+ ${_OPENSSL_LIBDIR}
+ ${OPENSSL_ROOT_DIR}/lib
+ )
+
MARK_AS_ADVANCED(SSL_EAY LIB_EAY)
set( OPENSSL_LIBRARIES ${SSL_EAY} ${LIB_EAY} )
ENDIF(MSVC)
ELSE(WIN32 AND NOT CYGWIN)
- FIND_LIBRARY(OPENSSL_SSL_LIBRARIES NAMES ssl ssleay32 ssleay32MD)
- FIND_LIBRARY(OPENSSL_CRYPTO_LIBRARIES NAMES crypto)
+ FIND_LIBRARY(OPENSSL_SSL_LIBRARIES
+ NAMES
+ ssl
+ ssleay32
+ ssleay32MD
+ PATHS
+ ${_OPENSSL_LIBDIR}
+ )
+
+ FIND_LIBRARY(OPENSSL_CRYPTO_LIBRARIES
+ NAMES
+ crypto
+ PATHS
+ ${_OPENSSL_LIBDIR}
+ )
+
MARK_AS_ADVANCED(OPENSSL_CRYPTO_LIBRARIES OPENSSL_SSL_LIBRARIES)
SET(OPENSSL_LIBRARIES ${OPENSSL_SSL_LIBRARIES} ${OPENSSL_CRYPTO_LIBRARIES})
-----------------------------------------------------------------------
Summary of changes:
Modules/FindOpenSSL.cmake | 218 ++++++++++++++++++++++++++++++++-------------
1 files changed, 156 insertions(+), 62 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list