summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2008-02-11 22:33:46 (GMT)
committerBrad King <brad.king@kitware.com>2008-02-11 22:33:46 (GMT)
commita0715048dadc4402417a93cca15f3d2ef0db42de (patch)
tree18127f727b1f3a416e5f1d9a33bf559c318e3d5a /Source
parentf0cee3fe4cfa485de4748fb0586f7fa3c3095657 (diff)
downloadCMake-a0715048dadc4402417a93cca15f3d2ef0db42de.zip
CMake-a0715048dadc4402417a93cca15f3d2ef0db42de.tar.gz
CMake-a0715048dadc4402417a93cca15f3d2ef0db42de.tar.bz2
COMP: Fix shadowed local variable warning.
Diffstat (limited to 'Source')
-rw-r--r--Source/cmAddCustomTargetCommand.cxx2
-rw-r--r--Source/cmAddExecutableCommand.cxx2
-rw-r--r--Source/cmAddLibraryCommand.cxx2
3 files changed, 6 insertions, 0 deletions
diff --git a/Source/cmAddCustomTargetCommand.cxx b/Source/cmAddCustomTargetCommand.cxx
index 085a80d..d7e479a 100644
--- a/Source/cmAddCustomTargetCommand.cxx
+++ b/Source/cmAddCustomTargetCommand.cxx
@@ -159,12 +159,14 @@ bool cmAddCustomTargetCommand
}
// Enforce name uniqueness.
+ {
std::string msg;
if(!this->Makefile->EnforceUniqueName(args[0], msg))
{
this->SetError(msg.c_str());
return false;
}
+ }
// Add the utility target to the makefile.
bool escapeOldStyle = !verbatim;
diff --git a/Source/cmAddExecutableCommand.cxx b/Source/cmAddExecutableCommand.cxx
index 7445069..bd3623f 100644
--- a/Source/cmAddExecutableCommand.cxx
+++ b/Source/cmAddExecutableCommand.cxx
@@ -101,12 +101,14 @@ bool cmAddExecutableCommand
}
// Enforce name uniqueness.
+ {
std::string msg;
if(!this->Makefile->EnforceUniqueName(exename, msg))
{
this->SetError(msg.c_str());
return false;
}
+ }
if (s == args.end())
{
diff --git a/Source/cmAddLibraryCommand.cxx b/Source/cmAddLibraryCommand.cxx
index 3896722..575dd04 100644
--- a/Source/cmAddLibraryCommand.cxx
+++ b/Source/cmAddLibraryCommand.cxx
@@ -128,12 +128,14 @@ bool cmAddLibraryCommand
}
// Enforce name uniqueness.
+ {
std::string msg;
if(!this->Makefile->EnforceUniqueName(libName, msg))
{
this->SetError(msg.c_str());
return false;
}
+ }
if (s == args.end())
{