[Cmake-commits] CMake branch, next, updated. v2.8.2-358-ga2515f8

[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  a2515f8d2ab02403a661e680785b4f3abc927b9e (commit)
       via  3296e6ad90865ae618435452e3422eab97ce9a09 (commit)
      from  8dc9286a3d9424c38049ca5cb396c1dda7b438e4 (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=a2515f8d2ab02403a661e680785b4f3abc927b9e
commit a2515f8d2ab02403a661e680785b4f3abc927b9e
Merge: 8dc9286 3296e6a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Aug 5 17:09:43 2010 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Aug 5 17:09:43 2010 -0400

    Merge topic 'system-libarchive-include' into next
    
    3296e6a Include headers from chosen libarchive (#10923)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3296e6ad90865ae618435452e3422eab97ce9a09
commit 3296e6ad90865ae618435452e3422eab97ce9a09
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Aug 5 17:06:10 2010 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Aug 5 17:06:10 2010 -0400

    Include headers from chosen libarchive (#10923)
    
    When CMAKE_USE_SYSTEM_LIBARCHIVE is on we must include the system
    libarchive headers to match the library that will be linked.

diff --git a/Source/CPack/cmCPackArchiveGenerator.cxx b/Source/CPack/cmCPackArchiveGenerator.cxx
index a52d05e..5981603 100644
--- a/Source/CPack/cmCPackArchiveGenerator.cxx
+++ b/Source/CPack/cmCPackArchiveGenerator.cxx
@@ -22,9 +22,7 @@
 #include <errno.h>
 
 #include <cmsys/SystemTools.hxx>
-#include <cmlibarchive/libarchive/archive.h>
-#include <cmlibarchive/libarchive/archive_entry.h>
-
+#include <cm_libarchive.h>
 
 //----------------------------------------------------------------------
 cmCPackArchiveGenerator::cmCPackArchiveGenerator(CompressType t,
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index 0badbba..2364d7e 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -23,8 +23,7 @@
 #include <cmsys/Directory.hxx>
 #include <cmsys/System.h>
 #if defined(CMAKE_BUILD_WITH_CMAKE)
-#include <cmlibarchive/libarchive/archive.h>
-#include <cmlibarchive/libarchive/archive_entry.h>
+# include <cm_libarchive.h>
 # include <cmsys/Terminal.h>
 #endif
 #include <cmsys/stl/algorithm>
diff --git a/Utilities/cmThirdParty.h.in b/Utilities/cmThirdParty.h.in
index 6cdd47c..daf8114 100644
--- a/Utilities/cmThirdParty.h.in
+++ b/Utilities/cmThirdParty.h.in
@@ -16,6 +16,7 @@
 #cmakedefine CMAKE_USE_SYSTEM_CURL
 #cmakedefine CMAKE_USE_SYSTEM_EXPAT
 #cmakedefine CMAKE_USE_SYSTEM_ZLIB
+#cmakedefine CMAKE_USE_SYSTEM_LIBARCHIVE
 #cmakedefine CTEST_USE_XMLRPC
 
 #endif
diff --git a/Utilities/cmThirdParty.h.in b/Utilities/cm_libarchive.h
similarity index 57%
copy from Utilities/cmThirdParty.h.in
copy to Utilities/cm_libarchive.h
index 6cdd47c..1469bae 100644
--- a/Utilities/cmThirdParty.h.in
+++ b/Utilities/cm_libarchive.h
@@ -1,6 +1,6 @@
 /*============================================================================
   CMake - Cross Platform Makefile Generator
-  Copyright 2000-2009 Kitware, Inc., Insight Software Consortium
+  Copyright 2000-2010 Kitware, Inc., Insight Software Consortium
 
   Distributed under the OSI-approved BSD License (the "License");
   see accompanying file Copyright.txt for details.
@@ -9,13 +9,17 @@
   implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the License for more information.
 ============================================================================*/
-#ifndef __cmThirdParty_h
-#define __cmThirdParty_h
+#ifndef __cm_libarchive_h
+#define __cm_libarchive_h
 
-/* Whether CMake is using its own utility libraries.  */
-#cmakedefine CMAKE_USE_SYSTEM_CURL
-#cmakedefine CMAKE_USE_SYSTEM_EXPAT
-#cmakedefine CMAKE_USE_SYSTEM_ZLIB
-#cmakedefine CTEST_USE_XMLRPC
+/* Use the libarchive configured for CMake.  */
+#include "cmThirdParty.h"
+#ifdef CMAKE_USE_SYSTEM_LIBARCHIVE
+# include <archive.h>
+# include <archive_entry.h>
+#else
+# include <cmlibarchive/libarchive/archive.h>
+# include <cmlibarchive/libarchive/archive_entry.h>
+#endif
 
 #endif

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

Summary of changes:
 Source/CPack/cmCPackArchiveGenerator.cxx           |    4 +---
 Source/cmSystemTools.cxx                           |    3 +--
 Utilities/cmThirdParty.h.in                        |    1 +
 .../cm_libarchive.h                                |   17 +++++++++++++----
 4 files changed, 16 insertions(+), 9 deletions(-)
 copy Source/cmStandardIncludes.cxx => Utilities/cm_libarchive.h (64%)


hooks/post-receive
-- 
CMake