[Cmake-commits] CMake branch, next, updated. v3.0.0-rc4-2685-g2afb232

[Ben Boeckel]

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  2afb232456586a2803034dea8c77226fa2a4eeaf (commit)
       via  3bd7628953faa0a08790001dc75e8d1b52f10631 (commit)
      from  19dc6d010dba3a135f71d61a9bfee562d1016868 (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=2afb232456586a2803034dea8c77226fa2a4eeaf
commit 2afb232456586a2803034dea8c77226fa2a4eeaf
Merge: 19dc6d0 3bd7628
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Thu May 1 15:03:29 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu May 1 15:03:29 2014 -0400

    Merge topic 'dev/faster-evis' into next
    
    3bd76289 EVIS: Fix CMAKE_CURRENT_LIST_LINE


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3bd7628953faa0a08790001dc75e8d1b52f10631
commit 3bd7628953faa0a08790001dc75e8d1b52f10631
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Thu May 1 15:09:20 2014 -0400
Commit:     Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Thu May 1 15:09:20 2014 -0400

    EVIS: Fix CMAKE_CURRENT_LIST_LINE

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 481bb05..3339c16 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -2855,6 +2855,7 @@ cmake::MessageType cmMakefile::ExpandVariablesInStringNew(
           result.append(last, in - last);
           std::string const& lookup = result.substr(var.loc);
           const char* value = NULL;
+          std::string varresult;
           static const std::string lineVar = "CMAKE_CURRENT_LIST_LINE";
           switch(var.domain)
             {
@@ -2863,7 +2864,7 @@ cmake::MessageType cmMakefile::ExpandVariablesInStringNew(
                 {
                 cmOStringStream ostr;
                 ostr << line;
-                result.append(ostr.str());
+                varresult = ostr.str();
                 }
               else
                 {
@@ -2878,7 +2879,6 @@ cmake::MessageType cmMakefile::ExpandVariablesInStringNew(
               break;
             }
           // Get the string we're meant to append to.
-          std::string varresult;
           if(value)
             {
             if(escapeQuotes)

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

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


hooks/post-receive
-- 
CMake