summaryrefslogtreecommitdiffstats
path: root/Help
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2015-12-09 13:36:56 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2015-12-09 13:36:56 (GMT)
commitdc873f6eef1e6f952cf3d09be7568b03fbf8c6d3 (patch)
tree71d1333fb6237bb40754833042be93b4d5336732 /Help
parentad1be6ee769ecaba4d6dadae84c0fc372049a333 (diff)
parentbc35087da3eb9039dad8fb5d27c1fab60b43f776 (diff)
downloadCMake-dc873f6eef1e6f952cf3d09be7568b03fbf8c6d3.zip
CMake-dc873f6eef1e6f952cf3d09be7568b03fbf8c6d3.tar.gz
CMake-dc873f6eef1e6f952cf3d09be7568b03fbf8c6d3.tar.bz2
Merge topic 'cmake-E-copy-multiple-inputs'
bc35087d cmake: Teach -E copy_directory to support multiple input directories 98be140f cmake: Refine -E copy[_if_different] documentation 93cc80ae cmake: Refine -E copy_if_different implementation indentation 0903812b cmake: Refine -E chdir documentation
Diffstat (limited to 'Help')
-rw-r--r--Help/manual/cmake.1.rst14
-rw-r--r--Help/release/dev/cmake-E-copy-multiple-inputs.rst3
2 files changed, 13 insertions, 4 deletions
diff --git a/Help/manual/cmake.1.rst b/Help/manual/cmake.1.rst
index 086f259..4cbe976 100644
--- a/Help/manual/cmake.1.rst
+++ b/Help/manual/cmake.1.rst
@@ -170,13 +170,19 @@ Available commands are:
Check if file1 is same as file2.
``copy <file>... <destination>``
- Copy files to 'destination' (either file or directory).
+ Copy files to ``<destination>`` (either file or directory).
+ If multiple files are specified, the ``<destination>`` must be
+ directory and it must exist.
-``copy_directory <source> <destination>``
- Copy directory 'source' content to directory 'destination'.
+``copy_directory <dir>... <destination>``
+ Copy directories to ``<destination>`` directory.
+ If ``<destination>`` directory does not exist it will be created.
``copy_if_different <file>... <destination>``
- Copy files if input has changed. Destination could be file or directory.
+ Copy files to ``<destination>`` (either file or directory) if
+ they have changed.
+ If multiple files are specified, the ``<destination>`` must be
+ directory and it must exist.
``echo [<string>...]``
Displays arguments as text.
diff --git a/Help/release/dev/cmake-E-copy-multiple-inputs.rst b/Help/release/dev/cmake-E-copy-multiple-inputs.rst
index 798af53..eeb1fab 100644
--- a/Help/release/dev/cmake-E-copy-multiple-inputs.rst
+++ b/Help/release/dev/cmake-E-copy-multiple-inputs.rst
@@ -3,3 +3,6 @@ cmake-E-copy-multiple-inputs
* The :manual:`cmake(1)` ``-E copy`` and ``-E copy_if_different`` command-line
tools learned to support copying multiple input files to a directory.
+
+* The :manual:`cmake(1)` ``-E copy_directory`` command-line
+ tool learned to support copying multiple input directories to a directory.