summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorPeter Kümmel <syntheticpp@gmx.net>2012-07-16 15:09:10 (GMT)
committerPeter Kümmel <syntheticpp@gmx.net>2012-07-16 15:09:10 (GMT)
commitc8641037487fbce4e3901ad87087181c42b0d356 (patch)
treecef061b284d30570faaefa996ad9727a6fb3da22 /Source
parent6547f369e4c3b71071da8534fcbe141320389c82 (diff)
downloadCMake-c8641037487fbce4e3901ad87087181c42b0d356.zip
CMake-c8641037487fbce4e3901ad87087181c42b0d356.tar.gz
CMake-c8641037487fbce4e3901ad87087181c42b0d356.tar.bz2
Ninja: path is already declared
Diffstat (limited to 'Source')
-rw-r--r--Source/cmGlobalNinjaGenerator.cxx12
1 files changed, 6 insertions, 6 deletions
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());
}
}