kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Ninja: path is already declared

This commit is contained in:
Peter Kümmel 2012-07-16 17:09:10 +02:00
parent 6547f369e4
commit c864103748
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Source/cmGlobalNinjaGenerator.cxx
View File

@ -479,22 +479,22 @@ void cmGlobalNinjaGenerator
std::string windres = cmSystemTools::FindProgram("windres"); std::string windres = cmSystemTools::FindProgram("windres");
if(windres.empty()) if(windres.empty())
{ {
std::string path; std::string compiler_path;
std::string::size_type prefix = std::string::npos; std::string::size_type prefix = std::string::npos;
if (mf->GetDefinition("CMAKE_C_COMPILER")) if (mf->GetDefinition("CMAKE_C_COMPILER"))
{ {
path = mf->GetDefinition("CMAKE_C_COMPILER"); compiler_path = mf->GetDefinition("CMAKE_C_COMPILER");
prefix = path.rfind("gcc"); prefix = compiler_path.rfind("gcc");
} }
else if (mf->GetDefinition("CMAKE_CXX_COMPILER")) else if (mf->GetDefinition("CMAKE_CXX_COMPILER"))
{ {
path = mf->GetDefinition("CMAKE_CXX_COMPILER"); compiler_path = mf->GetDefinition("CMAKE_CXX_COMPILER");
prefix = path.rfind("++"); prefix = compiler_path.rfind("++");
prefix--; prefix--;
} }
if (prefix != std::string::npos) if (prefix != std::string::npos)
{ {
windres = path.substr(0, prefix) + "windres"; windres = compiler_path.substr(0, prefix) + "windres";
windres = cmSystemTools::FindProgram(windres.c_str()); windres = cmSystemTools::FindProgram(windres.c_str());
} }
} }