[Cmake-commits] CMake branch, next, updated. v2.8.9-650-gf7727eb

Stephen Kelly steveire at gmail.com
Thu Sep 20 06:16:39 EDT 2012


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  f7727eb0233ed8502a966adcb20a050e0275ef28 (commit)
       via  fb578c8635b3c09f4a838c2ec9c671d9f1be34cd (commit)
      from  bd63db61149a9d57887ad7f41160cd7f89c70749 (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=f7727eb0233ed8502a966adcb20a050e0275ef28
commit f7727eb0233ed8502a966adcb20a050e0275ef28
Merge: bd63db6 fb578c8
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Sep 20 06:16:38 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Sep 20 06:16:38 2012 -0400

    Merge topic 'generator-expression-refactor' into next
    
    fb578c8 Fix the regular expression validator for target names.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fb578c8635b3c09f4a838c2ec9c671d9f1be34cd
commit fb578c8635b3c09f4a838c2ec9c671d9f1be34cd
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Sep 20 12:12:00 2012 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Sep 20 12:13:33 2012 +0200

    Fix the regular expression validator for target names.
    
    Regression introduced by f1eacf0e07759b57d100dbf5d83c70e4028bcb54.
    Target names have different valid contents to config names.

diff --git a/Source/cmGeneratorExpressionEvaluator.cxx b/Source/cmGeneratorExpressionEvaluator.cxx
index acc844a..9f84ed2 100644
--- a/Source/cmGeneratorExpressionEvaluator.cxx
+++ b/Source/cmGeneratorExpressionEvaluator.cxx
@@ -299,7 +299,7 @@ struct TargetFilesystemArtifact : public cmGeneratorExpressionNode
     std::string name = *parameters.begin();
 
     cmsys::RegularExpression targetValidator;
-    targetValidator.compile("^[A-Za-z0-9_]+$");
+    targetValidator.compile("^[A-Za-z0-9_.-]+$");
     if (!targetValidator.find(name.c_str()))
       {
       ::reportError(context, content->GetOriginalExpression(),

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

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


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list