[Cmake-commits] CMake branch, next, updated. v2.8.9-656-g184d6b0

[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  184d6b0b638a50aff483e1f3244800967030960a (commit)
       via  f20af79956bff9ddd0bf428a2731b9c817de93a1 (commit)
      from  f321a201bd59640639ad27cacef94501b5367391 (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=184d6b0b638a50aff483e1f3244800967030960a
commit 184d6b0b638a50aff483e1f3244800967030960a
Merge: f321a20 f20af79
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Sep 21 05:39:53 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Sep 21 05:39:53 2012 -0400

    Merge topic 'generator-expression-refactor' into next
    
    f20af79 Handle colons as a special case in the generator expression parser.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f20af79956bff9ddd0bf428a2731b9c817de93a1
commit f20af79956bff9ddd0bf428a2731b9c817de93a1
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Sep 21 11:31:03 2012 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Sep 21 11:33:46 2012 +0200

    Handle colons as a special case in the generator expression parser.
    
    Like the special case for commas, this ensures that the colon only has
    special meaning as the delimiter between the identifier and the
    parameters of a particular expression, but constructs such as
    
     INCLUDE_DIRECTORIES "$<1:C:\foo>"
    
    are legal.

diff --git a/Source/cmGeneratorExpressionParser.cxx b/Source/cmGeneratorExpressionParser.cxx
index 2a5cc7a..d3c4aa3 100644
--- a/Source/cmGeneratorExpressionParser.cxx
+++ b/Source/cmGeneratorExpressionParser.cxx
@@ -127,6 +127,11 @@ void cmGeneratorExpressionParser::ParseGeneratorExpression(
         parameters.resize(parameters.size() + 1);
         ++this->it;
         }
+      if (this->it->TokenType == cmGeneratorExpressionToken::ColonSeparator)
+        {
+        extendText(*(parameters.end() - 1), this->it);
+        ++this->it;
+        }
       if (this->it == this->Tokens.end())
         {
         break;

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

Summary of changes:
 Source/cmGeneratorExpressionParser.cxx |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake