[Cmake-commits] CMake branch, next, updated. v2.8.12.1-5823-g349628c

[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  349628cbf5715edbacb9844fd5d84f604b8cdaec (commit)
       via  ebeb31db2f7320fcccdfb077f6e86c7377b64d70 (commit)
       via  97b0abb4230b2901ad7f0921cb100ae88e310efc (commit)
       via  b4727858c482b85a8d0b9d4afb2d77c3167ad770 (commit)
      from  1a7f705303e1f443723f63df8cac6eb41170cdc2 (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=349628cbf5715edbacb9844fd5d84f604b8cdaec
commit 349628cbf5715edbacb9844fd5d84f604b8cdaec
Merge: 1a7f705 ebeb31d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Nov 26 06:11:11 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Nov 26 06:11:11 2013 -0500

    Merge topic 'minor-cleanups' into next
    
    ebeb31d Help: Fix typo in CMP0040 docs.
    97b0abb Help: Fix typo in genex docs.
    b472785 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ebeb31db2f7320fcccdfb077f6e86c7377b64d70
commit ebeb31db2f7320fcccdfb077f6e86c7377b64d70
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Nov 26 11:33:13 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Nov 26 12:10:37 2013 +0100

    Help: Fix typo in CMP0040 docs.
    
    'report and error' -> 'report an error'

diff --git a/Help/policy/CMP0040.rst b/Help/policy/CMP0040.rst
index 99b54ff..5d27f62 100644
--- a/Help/policy/CMP0040.rst
+++ b/Help/policy/CMP0040.rst
@@ -8,7 +8,7 @@ the TARGET signature of :command:`add_custom_command`
 if the target is unknown.
 
 The OLD behavior for this policy is to ignore custom commands
-for unknown targets. The NEW behavior for this policy is to report and error
+for unknown targets. The NEW behavior for this policy is to report an error
 if the target referenced in :command:`add_custom_command` is unknown.
 
 This policy was introduced in CMake version 3.0.0.  CMake version

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=97b0abb4230b2901ad7f0921cb100ae88e310efc
commit 97b0abb4230b2901ad7f0921cb100ae88e310efc
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Nov 26 10:22:46 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Nov 26 12:10:25 2013 +0100

    Help: Fix typo in genex docs.
    
    would be require -> would require

diff --git a/Help/manual/cmake-generator-expressions.7.rst b/Help/manual/cmake-generator-expressions.7.rst
index 2a2b7dc..bd9e7c2 100644
--- a/Help/manual/cmake-generator-expressions.7.rst
+++ b/Help/manual/cmake-generator-expressions.7.rst
@@ -154,7 +154,7 @@ comparison::
 
 generates a string of the entries in the :prop_tgt:`INCLUDE_DIRECTORIES` target
 property with each entry preceeded by ``-I``. Note that a more-complete use
-in this situation would be require first checking if the INCLUDE_DIRECTORIES
+in this situation would require first checking if the INCLUDE_DIRECTORIES
 property is non-empty::
 
   $<$<BOOL:$<TARGET_PROPERTY:INCLUDE_DIRECTORIES>>:-I$<JOIN:$<TARGET_PROPERTY:INCLUDE_DIRECTORIES>, -I>>

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

Summary of changes:
 Help/manual/cmake-generator-expressions.7.rst |    2 +-
 Help/policy/CMP0040.rst                       |    2 +-
 Source/CMakeVersion.cmake                     |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake