[Cmake-commits] CMake branch, next, updated. v2.8.11.1-2667-g71a6b62
Brad King
brad.king at kitware.com
Wed Jun 19 10:14:59 EDT 2013
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 71a6b621712e1486ab37b2d7a0b0b745411ac5ef (commit)
via ae06f80716ff52b398dc9729ae73fe84baae049d (commit)
via ee59089803c9d61710f24cbe70a2a819c6b9f771 (commit)
via 381c76da0723d22001d88ad7c1e9b8bce44a1ff7 (commit)
from d76b841d95b996208d2dc6472eaf62cc2eed0b47 (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=71a6b621712e1486ab37b2d7a0b0b745411ac5ef
commit 71a6b621712e1486ab37b2d7a0b0b745411ac5ef
Merge: d76b841 ae06f80
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Jun 19 10:14:57 2013 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jun 19 10:14:57 2013 -0400
Merge topic 'doc-E-tar-zip' into next
ae06f80 cmake: Document "-E tar" support for .zip (#14225)
ee59089 CMake Nightly Date Stamp
381c76d CMake Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ae06f80716ff52b398dc9729ae73fe84baae049d
commit ae06f80716ff52b398dc9729ae73fe84baae049d
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Jun 19 10:03:40 2013 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Jun 19 10:05:44 2013 -0400
cmake: Document "-E tar" support for .zip (#14225)
Through use of libarchive internally we support .zip files as well as
.tar format. The ExternalProject module makes use of this feature.
Document support officially.
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index e757f3a..853e09c 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -1168,9 +1168,8 @@ void CMakeCommandUsage(const char* program)
<< " remove_directory dir - remove a directory and its contents\n"
<< " rename oldname newname - rename a file or directory "
"(on one volume)\n"
- << " tar [cxt][vfz][cvfj] file.tar "
- "file/dir1 file/dir2 ... - create a tar "
- "archive\n"
+ << " tar [cxt][vfz][cvfj] file.tar [file/dir1 file/dir2 ...]\n"
+ << " - create or extract a tar or zip archive\n"
<< " time command [args] ... - run command and return elapsed time\n"
<< " touch file - touch a file.\n"
<< " touch_nocreate file - touch a file but do not create it.\n"
-----------------------------------------------------------------------
Summary of changes:
Source/CMakeVersion.cmake | 2 +-
Source/cmake.cxx | 5 ++---
2 files changed, 3 insertions(+), 4 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list