From c8641037487fbce4e3901ad87087181c42b0d356 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20K=C3=BCmmel?= Date: Mon, 16 Jul 2012 17:09:10 +0200 Subject: [PATCH] Ninja: path is already declared --- Source/cmGlobalNinjaGenerator.cxx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx index abf5c8245..912e53ecf 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()); } }