[Cmake-commits] CMake branch, next, updated. v2.8.8-3480-g86403d9

[Peter Kuemmel]

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  86403d9cf76e8216128901f5ebb9f848fb8db294 (commit)
       via  c8641037487fbce4e3901ad87087181c42b0d356 (commit)
      from  a473edf6b06b4d89f7f16b07de8643db6e1b6e3a (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=86403d9cf76e8216128901f5ebb9f848fb8db294
commit 86403d9cf76e8216128901f5ebb9f848fb8db294
Merge: a473edf c864103
Author:     Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Mon Jul 16 11:11:22 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jul 16 11:11:22 2012 -0400

    Merge topic 'ninja-mingw-windres' into next
    
    c864103 Ninja: path is already declared


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c8641037487fbce4e3901ad87087181c42b0d356
commit c8641037487fbce4e3901ad87087181c42b0d356
Author:     Peter Kümmel <syntheticpp at gmx.net>
AuthorDate: Mon Jul 16 17:09:10 2012 +0200
Commit:     Peter Kümmel <syntheticpp at gmx.net>
CommitDate: Mon Jul 16 17:09:10 2012 +0200

    Ninja: path is already declared

diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx
index abf5c82..912e53e 100644
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@ -479,22 +479,22 @@ void cmGlobalNinjaGenerator
           std::string windres = cmSystemTools::FindProgram("windres");
           if(windres.empty())
             {
-            std::string path;
+            std::string compiler_path;
             std::string::size_type prefix = std::string::npos;
             if (mf->GetDefinition("CMAKE_C_COMPILER"))
               {
-              path = mf->GetDefinition("CMAKE_C_COMPILER");
-              prefix = path.rfind("gcc");
+              compiler_path = mf->GetDefinition("CMAKE_C_COMPILER");
+              prefix = compiler_path.rfind("gcc");
               }
             else if (mf->GetDefinition("CMAKE_CXX_COMPILER"))
               {
-              path = mf->GetDefinition("CMAKE_CXX_COMPILER");
-              prefix = path.rfind("++");
+              compiler_path = mf->GetDefinition("CMAKE_CXX_COMPILER");
+              prefix = compiler_path.rfind("++");
               prefix--;
               }
             if (prefix != std::string::npos)
               {
-              windres = path.substr(0, prefix) + "windres";
+              windres = compiler_path.substr(0, prefix) + "windres";
               windres = cmSystemTools::FindProgram(windres.c_str());
               }
             }

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

Summary of changes:
 Source/cmGlobalNinjaGenerator.cxx |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
CMake