[Cmake-commits] CMake branch, next, updated. v2.8.5-1703-g6c65ae1

[Bill Hoffman]

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  6c65ae17e1e88d9b16b2229c8ac90986ea55dd1b (commit)
       via  281f51e063c2f3245d11b085c06a7f4b5fe69fd3 (commit)
      from  6ceb3165edf40f5ba55d593c65e08b35047946a4 (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=6c65ae17e1e88d9b16b2229c8ac90986ea55dd1b
commit 6c65ae17e1e88d9b16b2229c8ac90986ea55dd1b
Merge: 6ceb316 281f51e
Author:     Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Wed Aug 24 16:11:46 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Aug 24 16:11:46 2011 -0400

    Merge topic 'fix_nmake_var_plus' into next
    
    281f51e Fix for bug #12413, nmake did not handle targets with + in the name.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=281f51e063c2f3245d11b085c06a7f4b5fe69fd3
commit 281f51e063c2f3245d11b085c06a7f4b5fe69fd3
Author:     Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Wed Aug 24 16:08:31 2011 -0400
Commit:     Bill Hoffman <bill.hoffman at kitware.com>
CommitDate: Wed Aug 24 16:08:31 2011 -0400

    Fix for bug #12413, nmake did not handle targets with + in the name.
    
    If you had a + in the name of a target with nmake, it created a variable
    in the makefile that used + in its name, which is not allowed by nmake.
    To make the implementation easier, + is now not allowed for any make
    generators as part of a variable name.

diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index 6ab5c2a..2eae9d0 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -1276,6 +1276,7 @@ cmLocalUnixMakefileGenerator3
   // and there are no "." charactors in the string, then return the
   // unmodified combination.
   if((!this->MakefileVariableSize && unmodified.find('.') == s.npos)
+     && (!this->MakefileVariableSize && unmodified.find('+') == s.npos)
      && (!this->MakefileVariableSize && unmodified.find('-') == s.npos))
     {
     return unmodified;
@@ -1297,6 +1298,7 @@ cmLocalUnixMakefileGenerator3
     {
     cmSystemTools::ReplaceString(ret, ".", "_");
     cmSystemTools::ReplaceString(ret, "-", "__");
+    cmSystemTools::ReplaceString(ret, "+", "___");
     int ni = 0;
     char buffer[5];
     // make sure the _ version is not already used, if

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

Summary of changes:
 Source/cmLocalUnixMakefileGenerator3.cxx |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake