[Cmake-commits] CMake branch, next, updated. v3.6.0-rc1-107-g627ad82

[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  627ad82ba68588053570af6d5926e85a7ae00337 (commit)
       via  dbc9f73d0e9ed5fd8a2a0e64e17d81f860643efd (commit)
      from  1cc2c0d0f7d9670de22a72d146aba68fadd4fea4 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=627ad82ba68588053570af6d5926e85a7ae00337
commit 627ad82ba68588053570af6d5926e85a7ae00337
Merge: 1cc2c0d dbc9f73
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jun 7 15:08:06 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jun 7 15:08:06 2016 -0400

    Merge topic 'fix-libarchive-openssl-no-hashes' into next
    
    dbc9f73d libarchive: Restore OpenSSL include directory from upstream


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dbc9f73d0e9ed5fd8a2a0e64e17d81f860643efd
commit dbc9f73d0e9ed5fd8a2a0e64e17d81f860643efd
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jun 7 15:03:32 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jun 7 15:05:11 2016 -0400

    libarchive: Restore OpenSSL include directory from upstream
    
    In commit v3.6.0-rc1~100^2 (libarchive: Drop early use of crypto
    library, 2016-05-03) we accidentally dropped the include directory for
    OpenSSL as well as the library.  Without that, it works only
    accidentally when CHECK_CRYPTO happens to choose the OpenSSL
    implementation and add the include directory.
    
    Reported-by: Bradley Lowekamp <blowekamp at mail.nih.gov>

diff --git a/Utilities/cmlibarchive/CMakeLists.txt b/Utilities/cmlibarchive/CMakeLists.txt
index 453a737..09bef51 100644
--- a/Utilities/cmlibarchive/CMakeLists.txt
+++ b/Utilities/cmlibarchive/CMakeLists.txt
@@ -509,6 +509,7 @@ IF(ENABLE_OPENSSL AND NOT CMAKE_SYSTEM_NAME MATCHES "Darwin")
   FIND_PACKAGE(OpenSSL)
   IF(OPENSSL_FOUND)
     SET(HAVE_LIBCRYPTO 1)
+    INCLUDE_DIRECTORIES(${OPENSSL_INCLUDE_DIR})
   ENDIF(OPENSSL_FOUND)
 ELSE()
   SET(OPENSSL_FOUND FALSE) # Override cached value

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

Summary of changes:
 Utilities/cmlibarchive/CMakeLists.txt |    1 +
 1 file changed, 1 insertion(+)


hooks/post-receive
-- 
CMake