[Cmake-commits] CMake branch, next, updated. v3.4.0-rc2-849-gfd65691

[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  fd65691ec3e92d8268d8370588b0e6bd3add0f1f (commit)
       via  4cfadee82628e5c8e7a7c33518d525082db1cc8b (commit)
      from  358bcae013fc6a3f0b670ad08942eac5abdbefd2 (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=fd65691ec3e92d8268d8370588b0e6bd3add0f1f
commit fd65691ec3e92d8268d8370588b0e6bd3add0f1f
Merge: 358bcae 4cfadee
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 22 08:52:28 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 22 08:52:28 2015 -0400

    Merge topic 'update-libarchive' into next
    
    4cfadee8 fixup! libarchive: Use CommonCrypto on OS X only when available


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4cfadee82628e5c8e7a7c33518d525082db1cc8b
commit 4cfadee82628e5c8e7a7c33518d525082db1cc8b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 22 08:52:10 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Oct 22 08:52:10 2015 -0400

    fixup! libarchive: Use CommonCrypto on OS X only when available

diff --git a/Utilities/cmlibarchive/libarchive/archive_cryptor_private.h b/Utilities/cmlibarchive/libarchive/archive_cryptor_private.h
index 690dfcc..9a96aee 100644
--- a/Utilities/cmlibarchive/libarchive/archive_cryptor_private.h
+++ b/Utilities/cmlibarchive/libarchive/archive_cryptor_private.h
@@ -32,7 +32,7 @@
 
 #ifdef __APPLE__
 # include <AvailabilityMacros.h>
-# if MAC_OS_X_VERSION_MAX_ALLOWED >= 1060
+# if MAC_OS_X_VERSION_MAX_ALLOWED >= 1080
 #  define ARCHIVE_CRYPTOR_USE_Apple_CommonCrypto
 # endif
 #endif

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

Summary of changes:
 Utilities/cmlibarchive/libarchive/archive_cryptor_private.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake