From a0715048dadc4402417a93cca15f3d2ef0db42de Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Mon, 11 Feb 2008 17:33:46 -0500
Subject: COMP: Fix shadowed local variable warning.
---
Source/cmAddCustomTargetCommand.cxx | 2 ++
Source/cmAddExecutableCommand.cxx | 2 ++
Source/cmAddLibraryCommand.cxx | 2 ++
3 files changed, 6 insertions(+)
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())
{
--
cgit v0.12