[Cmake-commits] CMake branch, next, updated. v2.8.9-1151-gce6e018

[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  ce6e018856f71c58d51e480974254cefb1d4bc35 (commit)
       via  8f141dbc024c5dde6e1631855f8ef26cf084aea0 (commit)
      from  9d98fe5a8b64f8b28afdd3c99de3101fb67e1032 (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=ce6e018856f71c58d51e480974254cefb1d4bc35
commit ce6e018856f71c58d51e480974254cefb1d4bc35
Merge: 9d98fe5 8f141db
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 19 08:40:14 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Oct 19 08:40:14 2012 -0400

    Merge topic 'genex-validate-target-property-names' into next
    
    8f141db GexEx: Re-order the target name regex ranges and add a comment.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8f141dbc024c5dde6e1631855f8ef26cf084aea0
commit 8f141dbc024c5dde6e1631855f8ef26cf084aea0
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 19 14:38:52 2012 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Oct 19 14:38:52 2012 +0200

    GexEx: Re-order the target name regex ranges and add a comment.

diff --git a/Source/cmGeneratorExpressionEvaluator.cxx b/Source/cmGeneratorExpressionEvaluator.cxx
index 5c449ae..ee1b60a 100644
--- a/Source/cmGeneratorExpressionEvaluator.cxx
+++ b/Source/cmGeneratorExpressionEvaluator.cxx
@@ -278,7 +278,9 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode
       return std::string();
       }
     cmsys::RegularExpression targetNameValidator;
-    targetNameValidator.compile("^[:A-Za-z0-9_.-]+$");
+    // The ':' is supported to allow use with IMPORTED targets. At least
+    // Qt 4 and 5 IMPORTED targets use ':' as the namespace delimiter.
+    targetNameValidator.compile("^[A-Za-z0-9_.:-]+$");
     cmsys::RegularExpression propertyNameValidator;
     propertyNameValidator.compile("^[A-Za-z0-9_]+$");
 
@@ -482,7 +484,8 @@ struct TargetFilesystemArtifact : public cmGeneratorExpressionNode
     std::string name = *parameters.begin();
 
     cmsys::RegularExpression targetValidator;
-    targetValidator.compile("^[A-Za-z0-9_.-:]+$");
+    // The ':' is supported to allow use with IMPORTED targets.
+    targetValidator.compile("^[A-Za-z0-9_.:-]+$");
     if (!targetValidator.find(name.c_str()))
       {
       ::reportError(context, content->GetOriginalExpression(),

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

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


hooks/post-receive
-- 
CMake