[Cmake-commits] CMake branch, next, updated. v2.8.12.2-7654-g6454cb0

[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  6454cb0f491ca26c3ebd535d10a12139e68b23cb (commit)
       via  3161b0da4716c0fbfeb3afeee69d444840e07843 (commit)
      from  9bf21aa8de4624d5a7c28ec7534dc842d6d580ed (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=6454cb0f491ca26c3ebd535d10a12139e68b23cb
commit 6454cb0f491ca26c3ebd535d10a12139e68b23cb
Merge: 9bf21aa 3161b0d
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Tue Feb 11 15:47:01 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 11 15:47:01 2014 -0500

    Merge topic 'dev/custom-parsers' into next
    
    3161b0da EVIS fixes for Borland


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3161b0da4716c0fbfeb3afeee69d444840e07843
commit 3161b0da4716c0fbfeb3afeee69d444840e07843
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Tue Feb 11 15:43:31 2014 -0500
Commit:     Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Tue Feb 11 15:43:31 2014 -0500

    EVIS fixes for Borland

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 6bac9bb..4f7fb83 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -2590,7 +2590,7 @@ const char *cmMakefile::ExpandVariablesInString(std::string& source,
         }
       else if (!removeEmpty)
         {
-        atwork.append(first, last);
+        atwork.append(first, last - first);
         }
 
       // Continue looking for @VAR@ further along the string.
@@ -2658,11 +2658,11 @@ const char *cmMakefile::ExpandVariablesInString(std::string& source,
           std::string lookup = var.lookup;
           if(lookup.empty())
             {
-            lookup.append(var.start, in);
+            lookup.append(var.start, in - var.start);
             }
           else
             {
-            lookup.append(last, in);
+            lookup.append(last, in - last);
             }
           const char* value = NULL;
           switch(var.domain)

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

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


hooks/post-receive
-- 
CMake