[Cmake-commits] CMake branch, next, updated. v2.8.3-1592-gbf38b1f

[Brad King]

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  bf38b1f123df150d08dd8328d163d9cefbbca8d4 (commit)
       via  ee55a4f70906a41db18df07de89383f0aa948c71 (commit)
      from  3ba7aa5be6a14e6c7184b3cdf83493f44d113807 (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=bf38b1f123df150d08dd8328d163d9cefbbca8d4
commit bf38b1f123df150d08dd8328d163d9cefbbca8d4
Merge: 3ba7aa5 ee55a4f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 8 15:23:58 2011 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 8 15:23:58 2011 -0500

    Merge topic 'linux-standard-base' into next
    
    ee55a4f libarchive: Use OpenSSL only if CMAKE_USE_OPENSSL (#11815)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ee55a4f70906a41db18df07de89383f0aa948c71
commit ee55a4f70906a41db18df07de89383f0aa948c71
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 8 15:22:50 2011 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Feb 8 15:22:50 2011 -0500

    libarchive: Use OpenSSL only if CMAKE_USE_OPENSSL (#11815)
    
    OpenSSL is not part of the Linux Standard Base but its headers and
    libraries may still be found at build time even though they may not be
    available at runtime.  Use it only if explicitly allowed.

diff --git a/Utilities/cmlibarchive/CMakeLists.txt b/Utilities/cmlibarchive/CMakeLists.txt
index 6472ec5..08cda1e 100644
--- a/Utilities/cmlibarchive/CMakeLists.txt
+++ b/Utilities/cmlibarchive/CMakeLists.txt
@@ -274,7 +274,11 @@ LA_CHECK_INCLUDE_FILE("windows.h" HAVE_WINDOWS_H)
 #
 # Find OpenSSL
 #
-FIND_PACKAGE(OpenSSL)
+IF(CMAKE_USE_OPENSSL)
+  FIND_PACKAGE(OpenSSL)
+ELSE()
+  SET(OPENSSL_FOUND 0)
+ENDIF()
 IF(OPENSSL_FOUND)
   INCLUDE_DIRECTORIES(${OPENSSL_INCLUDE_DIR})
   LIST(APPEND ADDITIONAL_LIBS ${OPENSSL_LIBRARIES})
@@ -296,7 +300,11 @@ LA_CHECK_INCLUDE_FILE("sha256.h" HAVE_SHA256_H)
 #
 # Find MD5/RMD160/SHA library
 #
-FIND_LIBRARY(CRYPTO_LIBRARY NAMES crypto)
+IF(CMAKE_USE_OPENSSL)
+  FIND_LIBRARY(CRYPTO_LIBRARY NAMES crypto)
+ELSE()
+  SET(CRYPTO_LIBRARY "")
+ENDIF()
 IF(CRYPTO_LIBRARY)
   LIST(APPEND ADDITIONAL_LIBS ${CRYPTO_LIBRARY})
 ELSE(CRYPTO_LIBRARY)

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

Summary of changes:
 Utilities/cmlibarchive/CMakeLists.txt |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake