summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2014-12-05 18:32:46 (GMT)
committerBrad King <brad.king@kitware.com>2014-12-05 18:32:46 (GMT)
commiteff4081bfbc7285ceeb5d6ec32a4f8682066cef6 (patch)
tree44aac3e8150c827294b6b0f976f13df386fa8e4c
parentc2d371034e01ce7472cafb177f272030c1242513 (diff)
parentfe21580b84d06c263bbcb6d90089b9e6bb91b25b (diff)
downloadCMake-eff4081bfbc7285ceeb5d6ec32a4f8682066cef6.zip
CMake-eff4081bfbc7285ceeb5d6ec32a4f8682066cef6.tar.gz
CMake-eff4081bfbc7285ceeb5d6ec32a4f8682066cef6.tar.bz2
Merge branch 'doc-file-GENERATE-order' into release
-rw-r--r--Help/command/file.rst4
1 files changed, 3 insertions, 1 deletions
diff --git a/Help/command/file.rst b/Help/command/file.rst
index dbc4149..5d3c4a9 100644
--- a/Help/command/file.rst
+++ b/Help/command/file.rst
@@ -247,7 +247,9 @@ the ``<format>`` and ``UTC`` options.
::
- file(GENERATE <options>...)
+ file(GENERATE OUTPUT output-file
+ <INPUT input-file|CONTENT content>
+ [CONDITION expression])
Generate an output file for each build configuration supported by the current
:manual:`CMake Generator <cmake-generators(7)>`. Evaluate