[Cmake-commits] CMake branch, next, updated. v3.0.0-rc3-2291-gcc2eeaf

[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  cc2eeafb5f1c0e2cb8f4fb1df0abb24c3c04b3f1 (commit)
       via  d9b591790e7cae2042db3b98bf98aa9a83a5cb06 (commit)
      from  998c356bfd0ee461dd39226a1671ddf1322342e3 (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=cc2eeafb5f1c0e2cb8f4fb1df0abb24c3c04b3f1
commit cc2eeafb5f1c0e2cb8f4fb1df0abb24c3c04b3f1
Merge: 998c356 d9b5917
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Apr 14 09:35:12 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Apr 14 09:35:12 2014 -0400

    Merge topic 'libarchive-no-acl' into next
    
    d9b59179 libarchive: Skip finding libacl.h when ENABLE_ACL is OFF (#14866)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d9b591790e7cae2042db3b98bf98aa9a83a5cb06
commit d9b591790e7cae2042db3b98bf98aa9a83a5cb06
Author:     Mike Crowe <mac at mcrowe.com>
AuthorDate: Tue Apr 8 13:08:46 2014 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Apr 14 09:34:12 2014 -0400

    libarchive: Skip finding libacl.h when ENABLE_ACL is OFF (#14866)

diff --git a/Utilities/cmlibarchive/CMakeLists.txt b/Utilities/cmlibarchive/CMakeLists.txt
index e493966..afb7cea 100644
--- a/Utilities/cmlibarchive/CMakeLists.txt
+++ b/Utilities/cmlibarchive/CMakeLists.txt
@@ -350,7 +350,11 @@ ENDMACRO (LA_CHECK_INCLUDE_FILE)
 LA_CHECK_INCLUDE_FILE("sys/types.h" HAVE_SYS_TYPES_H)
 
 # Alphabetize the rest unless there's a compelling reason
-LA_CHECK_INCLUDE_FILE("acl/libacl.h" HAVE_ACL_LIBACL_H)
+IF(ENABLE_ACL)
+  LA_CHECK_INCLUDE_FILE("acl/libacl.h" HAVE_ACL_LIBACL_H)
+ELSE(ENABLE_ACL)
+  SET(HAVE_ACL_LIBACL_H FALSE)
+ENDIF(ENABLE_ACL)
 LA_CHECK_INCLUDE_FILE("ctype.h" HAVE_CTYPE_H)
 LA_CHECK_INCLUDE_FILE("copyfile.h" HAVE_COPYFILE_H)
 LA_CHECK_INCLUDE_FILE("direct.h" HAVE_DIRECT_H)

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

Summary of changes:
 Utilities/cmlibarchive/CMakeLists.txt |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake