diff options
| author | Brad King <brad.king@kitware.com> | 2016-05-03 14:17:04 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-05-03 14:17:04 (GMT) |
| commit | 96c8a4769fe7aaf4ff533f3dc613eeb17d01daae (patch) | |
| tree | f857dc840513b754761d86a2e196b6ba928766e5 | |
| parent | e053510efa72fe4c4e647ccd9e9168d0e187ffd2 (diff) | |
| parent | 960afaad7f1bc02b93a786fad6169ce970b5d5e7 (diff) | |
| download | CMake-96c8a4769fe7aaf4ff533f3dc613eeb17d01daae.zip CMake-96c8a4769fe7aaf4ff533f3dc613eeb17d01daae.tar.gz CMake-96c8a4769fe7aaf4ff533f3dc613eeb17d01daae.tar.bz2 | |
Merge topic 'doc-cmake-E-updates'
960afaad Help: Improve 'cmake -E md5sum' documentation
25ee2c86 Help: Add missing space in cmake(1) manual
| -rw-r--r-- | Help/manual/cmake.1.rst | 7 | ||||
| -rw-r--r-- | Source/cmcmd.cxx | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/Help/manual/cmake.1.rst b/Help/manual/cmake.1.rst index 5295a48c..3ae2baf 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). @@ -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" |