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

COMP: Remove shadow variable warning

This commit is contained in:
Andy Cedilnik 2005-12-30 13:22:10 -05:00
parent 081625c610
commit 2804a0d7db
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Source/cmFindFileCommand.cxx
View File

@ -113,9 +113,10 @@ cmStdString cmFindFileCommand::FindHeaderInFrameworks(
const char* defineVar,
const char* file)
{
(void)defineVar;
#ifndef __APPLE__
(void)path;
(void)defineVar;
(void)file;
return cmStdString("");
#else
@ -150,11 +151,11 @@ cmStdString cmFindFileCommand::FindHeaderInFrameworks(
fpath += "/";
fpath += frameWorkName;
fpath += ".framework";
std::string path = fpath;
path += "/Headers/";
path += fileName;
std::cerr << "try " << path << "\n";
if(cmSystemTools::FileExists(path.c_str()))
std::string intPath = fpath;
intPath += "/Headers/";
intPath += fileName;
std::cerr << "try " << intPath << "\n";
if(cmSystemTools::FileExists(intPath.c_str()))
{
return fpath;
}

8
Source/cmGlobalXCodeGenerator.cxx
View File

@ -1198,12 +1198,12 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
std::vector<std::string>& frameworks = target.GetFrameworks();
if(frameworks.size())
{
for(std::vector<std::string>::iterator i = frameworks.begin();
i != frameworks.end(); ++i)
for(std::vector<std::string>::iterator fmIt = frameworks.begin();
fmIt != frameworks.end(); ++fmIt)
{
if(emitted.insert(*i).second)
if(emitted.insert(*fmIt).second)
{
fdirs += this->XCodeEscapePath(i->c_str());
fdirs += this->XCodeEscapePath(fmIt->c_str());
fdirs += " ";
}
}