[Cmake-commits] CMake branch, next, updated. v2.8.9-538-gfbc3d63

[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  fbc3d63568e9f17eeb09e7f73f5c16ce47e0a2cd (commit)
       via  b7ec9cf5473ed3b48d6fdb150b1b71cec15a5aad (commit)
       via  519c0a5d04f9b0436cbf70482663f39b2c6b6128 (commit)
      from  d9dbf5245af9c7e26d990db0805e01f2e26c275c (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=fbc3d63568e9f17eeb09e7f73f5c16ce47e0a2cd
commit fbc3d63568e9f17eeb09e7f73f5c16ce47e0a2cd
Merge: d9dbf52 b7ec9cf
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Sep 15 03:43:23 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Sep 15 03:43:23 2012 -0400

    Merge topic 'generator-expression-refactor' into next
    
    b7ec9cf Fully qualify the reportError method in the template struct.
    519c0a5 Can't use std::string::clear() in cmake.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b7ec9cf5473ed3b48d6fdb150b1b71cec15a5aad
commit b7ec9cf5473ed3b48d6fdb150b1b71cec15a5aad
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Sep 15 09:36:52 2012 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Sep 15 09:36:52 2012 +0200

    Fully qualify the reportError method in the template struct.
    
    xlC on the dashboard has a problem with finding the method from a
    template. Maybe this will fix it.

diff --git a/Source/cmGeneratorExpressionEvaluator.cxx b/Source/cmGeneratorExpressionEvaluator.cxx
index 8088548..b7c428c 100644
--- a/Source/cmGeneratorExpressionEvaluator.cxx
+++ b/Source/cmGeneratorExpressionEvaluator.cxx
@@ -205,22 +205,22 @@ struct TargetFilesystemArtifact : public cmGeneratorExpressionNode
     targetValidator.compile("^[A-Za-z0-9_]+$");
     if (!targetValidator.find(name.c_str()))
       {
-      reportError(context, content->GetOriginalExpression(),
-                  "Expression syntax not recognized.");
+      ::reportError(context, content->GetOriginalExpression(),
+                    "Expression syntax not recognized.");
       return std::string();
       }
     cmTarget* target = context->Makefile->FindTargetToUse(name.c_str());
     if(!target)
       {
-      reportError(context, content->GetOriginalExpression(),
-                  "No target \"" + name + "\"");
+      ::reportError(context, content->GetOriginalExpression(),
+                    "No target \"" + name + "\"");
       return std::string();
       }
     if(target->GetType() >= cmTarget::UTILITY &&
       target->GetType() != cmTarget::UNKNOWN_LIBRARY)
       {
-      reportError(context, content->GetOriginalExpression(),
-                  "Target \"" + name + "\" is not an executable or library.");
+      ::reportError(context, content->GetOriginalExpression(),
+                    "Target \"" + name + "\" is not an executable or library.");
       return std::string();
       }
     context->Targets.insert(target);
@@ -237,9 +237,9 @@ struct TargetFilesystemArtifact : public cmGeneratorExpressionNode
       // The file used to link to the target (.so, .lib, .a).
       if(!target->IsLinkable())
         {
-        reportError(context, content->GetOriginalExpression(),
-                    "TARGET_LINKER_FILE is allowed only for libraries and "
-                    "executables with ENABLE_EXPORTS.");
+        ::reportError(context, content->GetOriginalExpression(),
+                      "TARGET_LINKER_FILE is allowed only for libraries and "
+                      "executables with ENABLE_EXPORTS.");
         return std::string();
         }
       result = target->GetFullPath(context->Config,
@@ -250,16 +250,16 @@ struct TargetFilesystemArtifact : public cmGeneratorExpressionNode
       // The target soname file (.so.1).
       if(target->IsDLLPlatform())
         {
-        reportError(context, content->GetOriginalExpression(),
-                    "TARGET_SONAME_FILE is not allowed "
-                    "for DLL target platforms.");
+        ::reportError(context, content->GetOriginalExpression(),
+                      "TARGET_SONAME_FILE is not allowed "
+                      "for DLL target platforms.");
         return std::string();
         }
       if(target->GetType() != cmTarget::SHARED_LIBRARY)
         {
-        reportError(context, content->GetOriginalExpression(),
-                    "TARGET_SONAME_FILE is allowed only for "
-                    "SHARED libraries.");
+        ::reportError(context, content->GetOriginalExpression(),
+                      "TARGET_SONAME_FILE is allowed only for "
+                      "SHARED libraries.");
         return std::string();
         }
       result = target->GetDirectory(context->Config);

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=519c0a5d04f9b0436cbf70482663f39b2c6b6128
commit 519c0a5d04f9b0436cbf70482663f39b2c6b6128
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Sep 15 09:33:31 2012 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Sep 15 09:33:31 2012 +0200

    Can't use std::string::clear() in cmake.

diff --git a/Source/cmGeneratorExpression.cxx b/Source/cmGeneratorExpression.cxx
index 5146ad7..0885616 100644
--- a/Source/cmGeneratorExpression.cxx
+++ b/Source/cmGeneratorExpression.cxx
@@ -72,7 +72,7 @@ const char *cmCompiledGeneratorExpression::Evaluate(
     return this->Input;
     }
 
-  this->Output.clear();
+  this->Output = "";
 
   std::vector<cmGeneratorExpressionEvaluator*>::const_iterator it
                                                   = this->Evaluators.begin();
@@ -91,7 +91,7 @@ const char *cmCompiledGeneratorExpression::Evaluate(
     this->Output += (*it)->Evaluate(&context);
     if (context.HadError)
       {
-      this->Output.clear();
+      this->Output = "";
       break;
       }
     }

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

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


hooks/post-receive
-- 
CMake