[Cmake-commits] CMake branch, next, updated. v3.0.0-rc6-3422-g4d88875

[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  4d88875b97e709cc3a8c27cee9d377b617fda5bb (commit)
       via  4e374a328599a93dd25d1c5e40665cc8c2c4bbb2 (commit)
      from  f39581ee9fba268b3412ed3b65d4d9f90e9af96d (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=4d88875b97e709cc3a8c27cee9d377b617fda5bb
commit 4d88875b97e709cc3a8c27cee9d377b617fda5bb
Merge: f39581e 4e374a3
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed May 28 17:37:41 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed May 28 17:37:41 2014 -0400

    Merge topic 'consistent-genex-target-message' into next
    
    4e374a32 Whitespace.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4e374a328599a93dd25d1c5e40665cc8c2c4bbb2
commit 4e374a328599a93dd25d1c5e40665cc8c2c4bbb2
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed May 28 23:37:05 2014 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed May 28 23:37:05 2014 +0200

    Whitespace.

diff --git a/Source/cmGeneratorExpressionEvaluator.cxx b/Source/cmGeneratorExpressionEvaluator.cxx
index 0d388d1..a15e3ff 100644
--- a/Source/cmGeneratorExpressionEvaluator.cxx
+++ b/Source/cmGeneratorExpressionEvaluator.cxx
@@ -1460,8 +1460,8 @@ static const struct TargetPolicyNode : public cmGeneratorExpressionNode
     if (!context->HeadTarget)
       {
       reportError(context, content->GetOriginalExpression(),
-          "$<TARGET_POLICY:prop> may only be used with binary targets.  It may "
-          "not be used with add_custom_command or add_custom_target.");
+          "$<TARGET_POLICY:prop> may only be used with binary targets.  It "
+          "may not be used with add_custom_command or add_custom_target.");
       return std::string();
       }
 

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

Summary of changes:
 Source/cmGeneratorExpressionEvaluator.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake