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 c00ead9f5516d9d84da5bf365bf9d8345e1d347b (commit) via fe21580b84d06c263bbcb6d90089b9e6bb91b25b (commit) from b2dde0459e93b316d1c9700a466b9fb78c0f1c4f (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=c00ead9f5516d9d84da5bf365bf9d8345e1d347b commit c00ead9f5516d9d84da5bf365bf9d8345e1d347b Merge: b2dde04 fe21580 Author: Brad King <brad.k...@kitware.com> AuthorDate: Fri Dec 5 13:31:14 2014 -0500 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Fri Dec 5 13:31:14 2014 -0500 Merge topic 'doc-file-GENERATE-order' into next fe21580b Help: Document file(GENERATE) signature option order http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fe21580b84d06c263bbcb6d90089b9e6bb91b25b commit fe21580b84d06c263bbcb6d90089b9e6bb91b25b Author: Brad King <brad.k...@kitware.com> AuthorDate: Fri Dec 5 13:28:24 2014 -0500 Commit: Brad King <brad.k...@kitware.com> CommitDate: Fri Dec 5 13:28:24 2014 -0500 Help: Document file(GENERATE) signature option order In commit v3.1.0-rc1~484^2 (Help: Format and revise file() command documentation, 2014-05-23) the signature of file(GENERATE) was accidentally simplified too much and dropped specification of the required argument ordering. Restore the signature to make the order clear. 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 ----------------------------------------------------------------------- Summary of changes: Help/command/file.rst | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits