[Cmake-commits] CMake branch, next, updated. v2.8.2-453-g2caed59

[Eric Noulard]

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  2caed5991c9bc3e6129d7aa7434ce60bd14f96a8 (commit)
       via  fb41da4a6b648966e518cbe388b82bcde74f038e (commit)
      from  72362cca3d5470b023cc4899fe31799297aef295 (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=2caed5991c9bc3e6129d7aa7434ce60bd14f96a8
commit 2caed5991c9bc3e6129d7aa7434ce60bd14f96a8
Merge: 72362cc fb41da4
Author:     Eric Noulard <eric.noulard at gmail.com>
AuthorDate: Mon Aug 16 14:46:25 2010 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Aug 16 14:46:25 2010 -0400

    Merge topic 'libarchive-wrapper' into next
    
    fb41da4 Add Compress compress support to libarchive-wrapper


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fb41da4a6b648966e518cbe388b82bcde74f038e
commit fb41da4a6b648966e518cbe388b82bcde74f038e
Author:     Eric NOULARD <eric.noulard at gmail.com>
AuthorDate: Mon Aug 16 20:45:05 2010 +0200
Commit:     Eric NOULARD <eric.noulard at gmail.com>
CommitDate: Mon Aug 16 20:45:05 2010 +0200

    Add Compress compress support to libarchive-wrapper

diff --git a/Source/cmArchiveWrite.cxx b/Source/cmArchiveWrite.cxx
index 524e53e..d9e4742 100644
--- a/Source/cmArchiveWrite.cxx
+++ b/Source/cmArchiveWrite.cxx
@@ -63,6 +63,14 @@ cmArchiveWrite::cmArchiveWrite(std::ostream& os, Compress c, Type t):
         return;
         }
       break;
+    case CompressCompress:
+      if(archive_write_set_compression_compress(this->Archive) != ARCHIVE_OK)
+        {
+        this->Error = "archive_write_set_compression_compress: ";
+        this->Error += archive_error_string(this->Archive);
+        return;
+        }
+      break;
     case CompressGZip:
       if(archive_write_set_compression_gzip(this->Archive) != ARCHIVE_OK)
         {
diff --git a/Source/cmArchiveWrite.h b/Source/cmArchiveWrite.h
index ce7f961..3e3b2f0 100644
--- a/Source/cmArchiveWrite.h
+++ b/Source/cmArchiveWrite.h
@@ -31,6 +31,7 @@ public:
   enum Compress
   {
     CompressNone,
+    CompressCompress,
     CompressGZip,
     CompressBZip2,
     CompressLZMA,

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

Summary of changes:
 Source/cmArchiveWrite.cxx |    8 ++++++++
 Source/cmArchiveWrite.h   |    1 +
 2 files changed, 9 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake