[Cmake-commits] CMake branch, next, updated. v3.5.2-1178-g67ad27c
Brad King
brad.king at kitware.com
Mon May 2 10:02:59 EDT 2016
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 67ad27c3129bfd55d2ed78ad8dfa5aaea20da040 (commit)
via 960afaad7f1bc02b93a786fad6169ce970b5d5e7 (commit)
via 25ee2c86c1d231ee0f930e6cfe1bb5be5e4ee539 (commit)
from ebbb1d2809ca06b339fc5b941abe404b3adf245e (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=67ad27c3129bfd55d2ed78ad8dfa5aaea20da040
commit 67ad27c3129bfd55d2ed78ad8dfa5aaea20da040
Merge: ebbb1d2 960afaa
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon May 2 10:02:58 2016 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon May 2 10:02:58 2016 -0400
Merge topic 'doc-cmake-E-updates' into next
960afaad Help: Improve 'cmake -E md5sum' documentation
25ee2c86 Help: Add missing space in cmake(1) manual
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=960afaad7f1bc02b93a786fad6169ce970b5d5e7
commit 960afaad7f1bc02b93a786fad6169ce970b5d5e7
Author: Bartosz Kosiorek <gang65 at poczta.onet.pl>
AuthorDate: Mon May 2 12:27:57 2016 +0200
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon May 2 10:02:12 2016 -0400
Help: Improve 'cmake -E md5sum' documentation
diff --git a/Help/manual/cmake.1.rst b/Help/manual/cmake.1.rst
index 0b060bc..3ae2baf 100644
--- a/Help/manual/cmake.1.rst
+++ b/Help/manual/cmake.1.rst
@@ -204,7 +204,10 @@ Available commands are:
silently ignored.
``md5sum <file>...``
- Compute md5sum of files.
+ Create MD5 checksum of files in ``md5sum`` compatible format::
+
+ 351abe79cd3800b38cdfb25d45015a15 file1.txt
+ 052f86c15bbde68af55c7f7b340ab639 file2.txt
``remove [-f] <file>...``
Remove the file(s), use ``-f`` to force it. If a file does
diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx
index 22c6a06..01b12a3 100644
--- a/Source/cmcmd.cxx
+++ b/Source/cmcmd.cxx
@@ -70,7 +70,7 @@ void CMakeCommandUsage(const char* program)
<< " - run command in a modified environment\n"
<< " environment - display the current environment\n"
<< " make_directory <dir>... - create parent and <dir> directories\n"
- << " md5sum <file>... - compute md5sum of files\n"
+ << " md5sum <file>... - create MD5 checksum of files\n"
<< " remove [-f] <file>... - remove the file(s), use -f to force "
"it\n"
<< " remove_directory dir - remove a directory and its contents\n"
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=25ee2c86c1d231ee0f930e6cfe1bb5be5e4ee539
commit 25ee2c86c1d231ee0f930e6cfe1bb5be5e4ee539
Author: Bartosz Kosiorek <gang65 at poczta.onet.pl>
AuthorDate: Mon May 2 12:27:57 2016 +0200
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon May 2 09:51:29 2016 -0400
Help: Add missing space in cmake(1) manual
diff --git a/Help/manual/cmake.1.rst b/Help/manual/cmake.1.rst
index 5295a48c..0b060bc 100644
--- a/Help/manual/cmake.1.rst
+++ b/Help/manual/cmake.1.rst
@@ -169,7 +169,7 @@ Available commands are:
``compare_files <file1> <file2>``
Check if ``<file1>`` is same as ``<file2>``. If files are the same,
- then returns 0, if not itreturns 1.
+ then returns 0, if not it returns 1.
``copy <file>... <destination>``
Copy files to ``<destination>`` (either file or directory).
-----------------------------------------------------------------------
Summary of changes:
Help/manual/cmake.1.rst | 7 +++++--
Source/cmcmd.cxx | 2 +-
2 files changed, 6 insertions(+), 3 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list