[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3383-g98d86a2

[Stephen Kelly]

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  98d86a2f21c99013e856325b38662d84c0a2cd22 (commit)
       via  e454cba292f2acf29b4a7a39897f14b1dc1f2ad6 (commit)
      from  3d07638675856055561177ddf43b443915f3348c (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=98d86a2f21c99013e856325b38662d84c0a2cd22
commit 98d86a2f21c99013e856325b38662d84c0a2cd22
Merge: 3d07638 e454cba
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Jul 25 18:22:53 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jul 25 18:22:53 2013 -0400

    Merge topic 'file-GENERATE-docs' into next
    
    e454cba Docs: Document file(GENERATE) CONDITION as optional.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e454cba292f2acf29b4a7a39897f14b1dc1f2ad6
commit e454cba292f2acf29b4a7a39897f14b1dc1f2ad6
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Jul 26 00:21:50 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Jul 26 00:21:50 2013 +0200

    Docs: Document file(GENERATE) CONDITION as optional.

diff --git a/Source/cmFileCommand.h b/Source/cmFileCommand.h
index 586fee2..aa755d1 100644
--- a/Source/cmFileCommand.h
+++ b/Source/cmFileCommand.h
@@ -90,7 +90,7 @@ public:
       "  file(TIMESTAMP filename variable [<format string>] [UTC])\n"
       "  file(GENERATE OUTPUT output_file\n"
       "       <INPUT input_file|CONTENT input_content>\n"
-      "       CONDITION expression)\n"
+      "       [CONDITION expression])\n"
       "WRITE will write a message into a file called 'filename'. It "
       "overwrites the file if it already exists, and creates the file "
       "if it does not exist. (If the file is a build input, use "

-----------------------------------------------------------------------

Summary of changes:
 Source/cmFileCommand.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake