[Cmake-commits] CMake branch, master, updated. v3.1.0-726-gd9a6ea4

[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, master has been updated
       via  d9a6ea4599eb3b736b4e695a9ffd5d8a51eac059 (commit)
       via  4035ef786de80d4d2fc27cd5f03c629702f54762 (commit)
       via  d811d238abe2dcd04cebd7ee4c3f07f4b6da093f (commit)
       via  df16dcfb4478bb05932a1abb0e42433e60f1a565 (commit)
       via  b0a5d3932d2a6633d05eca3eb7fd632f433dca05 (commit)
      from  212bf1f82a522b7ee779b008a14c2e51fd104e5b (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=d9a6ea4599eb3b736b4e695a9ffd5d8a51eac059
commit d9a6ea4599eb3b736b4e695a9ffd5d8a51eac059
Merge: 212bf1f 4035ef7
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 12 09:39:40 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 12 09:39:40 2015 -0500

    Merge topic 'add-xz-support'
    
    4035ef78 cmake -E tar: error out on multiple compression formats
    d811d238 cmSystemTools: use an enumeration for compression formats
    df16dcfb cmake -E tar: add support for .xz files with 'J'
    b0a5d393 cmake -E tar: clean up flag documentation

diff --cc Source/cmcmd.cxx
index d3d85a5,27dd08b..70d98d2
--- a/Source/cmcmd.cxx
+++ b/Source/cmcmd.cxx
@@@ -751,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;
            }
          }

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

Summary of changes:
 Help/release/dev/add-xz-support.rst |    5 +++++
 Source/cmCTest.cxx                  |    3 ++-
 Source/cmSystemTools.cxx            |   29 +++++++++++++++++++++--------
 Source/cmSystemTools.h              |   15 +++++++++++----
 Source/cmcmd.cxx                    |   30 ++++++++++++++++++++++--------
 5 files changed, 61 insertions(+), 21 deletions(-)
 create mode 100644 Help/release/dev/add-xz-support.rst


hooks/post-receive
-- 
CMake