summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorAndy Cedilnik <andy.cedilnik@kitware.com>2005-12-30 18:22:10 (GMT)
committerAndy Cedilnik <andy.cedilnik@kitware.com>2005-12-30 18:22:10 (GMT)
commit2804a0d7dbaecd9571d672b3b1ac030c89bfb6d6 (patch)
treec887b4ae0ff1a9bbddfc3b8e8f13e7cc3a1b1d58 /Source
parent081625c6102b8e0e3b9e7a69253650fc1ff5ea4e (diff)
downloadCMake-2804a0d7dbaecd9571d672b3b1ac030c89bfb6d6.zip
CMake-2804a0d7dbaecd9571d672b3b1ac030c89bfb6d6.tar.gz
CMake-2804a0d7dbaecd9571d672b3b1ac030c89bfb6d6.tar.bz2
COMP: Remove shadow variable warning
Diffstat (limited to 'Source')
-rw-r--r--Source/cmFindFileCommand.cxx13
-rw-r--r--Source/cmGlobalXCodeGenerator.cxx8
2 files changed, 11 insertions, 10 deletions
diff --git a/Source/cmFindFileCommand.cxx b/Source/cmFindFileCommand.cxx
index d83cc7b..465d554 100644
--- a/Source/cmFindFileCommand.cxx
+++ b/Source/cmFindFileCommand.cxx
@@ -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;
}
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index fc37952..e4754b3 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -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 += " ";
}
}