[Cmake-commits] CMake branch, next, updated. v2.8.12.2-1661-gd718436

Brad King brad.king at kitware.com
Mon Feb 24 10:18:47 EST 2014


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  d718436d10807553fa4187f75e9dd1eddd443d85 (commit)
       via  bce9b36ff7e68c7960a8b777140796c86f372fff (commit)
      from  6c5e51253b0ba5e7c64f535b35b1b46535cc2794 (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=d718436d10807553fa4187f75e9dd1eddd443d85
commit d718436d10807553fa4187f75e9dd1eddd443d85
Merge: 6c5e512 bce9b36
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 24 10:18:47 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Feb 24 10:18:47 2014 -0500

    Merge topic 'dev/faster-evis' into next
    
    bce9b36f Fix Borland build error


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bce9b36ff7e68c7960a8b777140796c86f372fff
commit bce9b36ff7e68c7960a8b777140796c86f372fff
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 24 10:18:25 2014 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Feb 24 10:18:25 2014 -0500

    Fix Borland build error

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index cbe1691..6237da1 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -2963,7 +2963,7 @@ cmake::MessageType cmMakefile::ExpandVariablesInStringNew(
               result = cmSystemTools::EscapeQuotes(result.c_str());
               }
             // Skip over the variable.
-            openstack.top().lookup.append(last, in);
+            openstack.top().lookup.append(last, in - last);
             openstack.top().lookup.append(result);
             in = nextAt;
             last = in + 1;

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

Summary of changes:
 Source/cmMakefile.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list