[Cmake-commits] CMake branch, next, updated. v2.8.9-558-gb62d020

[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  b62d0206541b326a5e8a5c5a05134927efbeafc0 (commit)
       via  47aef4b48c067b2d30ea81e1ae8650573683753c (commit)
      from  33d81a51278de8d2b45c566d901c680330ce4b2c (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=b62d0206541b326a5e8a5c5a05134927efbeafc0
commit b62d0206541b326a5e8a5c5a05134927efbeafc0
Merge: 33d81a5 47aef4b
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Sep 17 11:27:16 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Sep 17 11:27:16 2012 -0400

    Merge topic 'generator-expression-refactor' into next
    
    47aef4b Remove the hadError from the result creator.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=47aef4b48c067b2d30ea81e1ae8650573683753c
commit 47aef4b48c067b2d30ea81e1ae8650573683753c
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Sep 17 17:23:53 2012 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Sep 17 17:26:07 2012 +0200

    Remove the hadError from the result creator.
    
    It is not needed, given that the context already stores that
    information.

diff --git a/Source/cmGeneratorExpressionEvaluator.cxx b/Source/cmGeneratorExpressionEvaluator.cxx
index 0dd8ac1..acc844a 100644
--- a/Source/cmGeneratorExpressionEvaluator.cxx
+++ b/Source/cmGeneratorExpressionEvaluator.cxx
@@ -185,8 +185,7 @@ struct TargetFilesystemArtifactResultCreator
 {
   static std::string Create(cmTarget* target,
                             cmGeneratorExpressionContext *context,
-                            const GeneratorExpressionContent *content,
-                            bool hadError);
+                            const GeneratorExpressionContent *content);
 };
 
 //----------------------------------------------------------------------------
@@ -195,8 +194,7 @@ struct TargetFilesystemArtifactResultCreator<false, true>
 {
   static std::string Create(cmTarget* target,
                             cmGeneratorExpressionContext *context,
-                            const GeneratorExpressionContent *content,
-                            bool *hadError)
+                            const GeneratorExpressionContent *content)
   {
     // The target soname file (.so.1).
     if(target->IsDLLPlatform())
@@ -204,7 +202,6 @@ struct TargetFilesystemArtifactResultCreator<false, true>
       ::reportError(context, content->GetOriginalExpression(),
                     "TARGET_SONAME_FILE is not allowed "
                     "for DLL target platforms.");
-      *hadError = true;
       return std::string();
       }
     if(target->GetType() != cmTarget::SHARED_LIBRARY)
@@ -212,7 +209,6 @@ struct TargetFilesystemArtifactResultCreator<false, true>
       ::reportError(context, content->GetOriginalExpression(),
                     "TARGET_SONAME_FILE is allowed only for "
                     "SHARED libraries.");
-      *hadError = true;
       return std::string();
       }
     std::string result = target->GetDirectory(context->Config);
@@ -228,8 +224,7 @@ struct TargetFilesystemArtifactResultCreator<true, false>
 {
   static std::string Create(cmTarget* target,
                             cmGeneratorExpressionContext *context,
-                            const GeneratorExpressionContent *content,
-                            bool *hadError)
+                            const GeneratorExpressionContent *content)
   {
     // The file used to link to the target (.so, .lib, .a).
     if(!target->IsLinkable())
@@ -237,7 +232,6 @@ struct TargetFilesystemArtifactResultCreator<true, false>
       ::reportError(context, content->GetOriginalExpression(),
                     "TARGET_LINKER_FILE is allowed only for libraries and "
                     "executables with ENABLE_EXPORTS.");
-      *hadError = true;
       return std::string();
       }
     return target->GetFullPath(context->Config,
@@ -251,8 +245,7 @@ struct TargetFilesystemArtifactResultCreator<false, false>
 {
   static std::string Create(cmTarget* target,
                             cmGeneratorExpressionContext *context,
-                            const GeneratorExpressionContent *,
-                            bool *)
+                            const GeneratorExpressionContent *)
   {
     return target->GetFullPath(context->Config, false, true);
   }
@@ -329,14 +322,12 @@ struct TargetFilesystemArtifact : public cmGeneratorExpressionNode
       }
     context->Targets.insert(target);
 
-    bool hadError;
     std::string result =
                 TargetFilesystemArtifactResultCreator<linker, soname>::Create(
                           target,
                           context,
-                          content,
-                          &hadError);
-    if (hadError)
+                          content);
+    if (context->HadError)
       {
       return std::string();
       }

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

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


hooks/post-receive
-- 
CMake