[Cmake-commits] CMake branch, next, updated. v3.1.0-rc2-917-ga9c5728

[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  a9c57286338131f1109bc73a7527c2d1bc19b3c5 (commit)
       via  251827cc2801b7345239fe77d983371bfde438ff (commit)
      from  afd97471ab39ab780ae72c8477852ce09df0a2e2 (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=a9c57286338131f1109bc73a7527c2d1bc19b3c5
commit a9c57286338131f1109bc73a7527c2d1bc19b3c5
Merge: afd9747 251827c
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Nov 29 06:24:47 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Nov 29 06:24:47 2014 -0500

    Merge topic 'target-sources-error-conditions' into next
    
    251827cc Rename variable.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=251827cc2801b7345239fe77d983371bfde438ff
commit 251827cc2801b7345239fe77d983371bfde438ff
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Nov 29 12:24:30 2014 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Nov 29 12:24:30 2014 +0100

    Rename variable.

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 6c2f9e1..ad1c83e 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -685,19 +685,19 @@ static bool processSources(cmTarget const* tgt,
 
       if (!targetName.empty() && !cmSystemTools::FileIsFullPath(src.c_str()))
         {
-        cmOStringStream e;
+        cmOStringStream err;
         if (!targetName.empty())
           {
-          e << "Target \"" << targetName << "\" contains relative "
+          err << "Target \"" << targetName << "\" contains relative "
             "path in its INTERFACE_SOURCES:\n"
             "  \"" << src << "\"";
           }
         else
           {
-          e << "Found relative path while evaluating sources of "
+          err << "Found relative path while evaluating sources of "
           "\"" << tgt->GetName() << "\":\n  \"" << src << "\"\n";
           }
-        tgt->GetMakefile()->IssueMessage(cmake::FATAL_ERROR, e.str());
+        tgt->GetMakefile()->IssueMessage(cmake::FATAL_ERROR, err.str());
         return contextDependent;
         }
       src = fullPath;

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

Summary of changes:
 Source/cmTarget.cxx |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake