[Cmake-commits] CMake branch, next, updated. v3.1.0-1623-g5f33228

[Ben Boeckel]

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  5f3322884cc5903d3198f760191e2990c361330d (commit)
       via  f6de0b5eb61b389758505ccdeb2005b35cfc0a7e (commit)
       via  0d3deaa1147303b30fc4e5339ecab36f2df62264 (commit)
      from  a9adf6ad4b1300a805dca29fe8e09d4db3c9fd73 (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=5f3322884cc5903d3198f760191e2990c361330d
commit 5f3322884cc5903d3198f760191e2990c361330d
Merge: a9adf6a f6de0b5
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Fri Jan 9 12:05:26 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jan 9 12:05:26 2015 -0500

    Merge topic 'add-xz-support' into next
    
    f6de0b5e fixup! cmSystemTools: use an enumeration for compression formats
    0d3deaa1 cmSystemTools: remove unused gzip argument

diff --cc Source/cmcmd.cxx
index a3f0099,27dd08b..70d98d2
--- a/Source/cmcmd.cxx
+++ b/Source/cmcmd.cxx
@@@ -764,9 -765,9 +765,9 @@@ int cmcmd::ExecuteCMakeCommand(std::vec
  
        if ( flags.find_first_of('t') != flags.npos )
          {
-         if ( !cmSystemTools::ListTar(outFile.c_str(), gzip, verbose) )
+         if ( !cmSystemTools::ListTar(outFile.c_str(), verbose) )
            {
 -          cmSystemTools::Error("Problem creating tar: ", outFile.c_str());
 +          cmSystemTools::Error("Problem listing tar: ", outFile.c_str());
            return 1;
            }
          }

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f6de0b5eb61b389758505ccdeb2005b35cfc0a7e
commit f6de0b5eb61b389758505ccdeb2005b35cfc0a7e
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Fri Jan 9 12:05:19 2015 -0500
Commit:     Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Fri Jan 9 12:05:19 2015 -0500

    fixup! cmSystemTools: use an enumeration for compression formats

diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx
index 5fc4823..27dd08b 100644
--- a/Source/cmcmd.cxx
+++ b/Source/cmcmd.cxx
@@ -735,6 +735,7 @@ int cmcmd::ExecuteCMakeCommand(std::vector<std::string>& args)
         }
       cmSystemTools::cmTarCompression compress =
         cmSystemTools::TarCompressNone;
+      bool verbose = false;
       int nCompress = 0;
       if ( flags.find_first_of('j') != flags.npos )
         {

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0d3deaa1147303b30fc4e5339ecab36f2df62264
commit 0d3deaa1147303b30fc4e5339ecab36f2df62264
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Fri Jan 9 12:04:56 2015 -0500
Commit:     Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Fri Jan 9 12:04:56 2015 -0500

    cmSystemTools: remove unused gzip argument

diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index 036e859..0271665 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -1800,7 +1800,7 @@ bool extract_tar(const char* outFileName, bool verbose,
 #endif
 
 bool cmSystemTools::ExtractTar(const char* outFileName,
-                               bool , bool verbose)
+                               bool verbose)
 {
 #if defined(CMAKE_BUILD_WITH_CMAKE)
   return extract_tar(outFileName, verbose, true);
@@ -1812,7 +1812,6 @@ bool cmSystemTools::ExtractTar(const char* outFileName,
 }
 
 bool cmSystemTools::ListTar(const char* outFileName,
-                            bool ,
                             bool verbose)
 {
 #if defined(CMAKE_BUILD_WITH_CMAKE)
diff --git a/Source/cmSystemTools.h b/Source/cmSystemTools.h
index ad269b1..09ceea6 100644
--- a/Source/cmSystemTools.h
+++ b/Source/cmSystemTools.h
@@ -391,11 +391,11 @@ public:
     TarCompressNone
   };
   static bool ListTar(const char* outFileName,
-                      bool gzip, bool verbose);
+                      bool verbose);
   static bool CreateTar(const char* outFileName,
                         const std::vector<std::string>& files,
                         cmTarCompression compressType, bool verbose);
-  static bool ExtractTar(const char* inFileName, bool gzip,
+  static bool ExtractTar(const char* inFileName,
                          bool verbose);
   // This should be called first thing in main
   // it will keep child processes from inheriting the
diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx
index 1bfbb55..5fc4823 100644
--- a/Source/cmcmd.cxx
+++ b/Source/cmcmd.cxx
@@ -764,7 +764,7 @@ int cmcmd::ExecuteCMakeCommand(std::vector<std::string>& args)
 
       if ( flags.find_first_of('t') != flags.npos )
         {
-        if ( !cmSystemTools::ListTar(outFile.c_str(), gzip, verbose) )
+        if ( !cmSystemTools::ListTar(outFile.c_str(), verbose) )
           {
           cmSystemTools::Error("Problem creating tar: ", outFile.c_str());
           return 1;
@@ -782,7 +782,7 @@ int cmcmd::ExecuteCMakeCommand(std::vector<std::string>& args)
       else if ( flags.find_first_of('x') != flags.npos )
         {
         if ( !cmSystemTools::ExtractTar(
-            outFile.c_str(), gzip, verbose) )
+            outFile.c_str(), verbose) )
           {
           cmSystemTools::Error("Problem extracting tar: ", outFile.c_str());
           return 1;

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

Summary of changes:
 Source/cmSystemTools.cxx |    3 +--
 Source/cmSystemTools.h   |    4 ++--
 Source/cmcmd.cxx         |    5 +++--
 3 files changed, 6 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
CMake