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

COMP: Removed shadowed variable warning.

This commit is contained in:
Brad King 2005-01-29 07:57:21 -05:00
parent 0ab7b0988c
commit 52b533ce2b
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Source/cmLocalUnixMakefileGenerator2.cxx
View File

@ -382,6 +382,7 @@ cmLocalUnixMakefileGenerator2
} }
// Get the full path name of the object file. // Get the full path name of the object file.
// TODO: Remove duplicate objects and warn.
std::string obj = this->GetObjectFileName(target, source); std::string obj = this->GetObjectFileName(target, source);
// Create the directory containing the object file. This may be a // Create the directory containing the object file. This may be a
@ -560,19 +561,19 @@ cmLocalUnixMakefileGenerator2
{ {
// Add the provides target to build the object file. // Add the provides target to build the object file.
std::vector<std::string> no_commands; std::vector<std::string> no_commands;
std::vector<std::string> depends; std::vector<std::string> p_depends;
depends.push_back(obj); p_depends.push_back(obj);
this->WriteMakeRule(ruleFileStream, 0, 0, this->WriteMakeRule(ruleFileStream, 0, 0,
objectProvides.c_str(), depends, no_commands); objectProvides.c_str(), p_depends, no_commands);
} }
{ {
// Add the requires target to recursively build the provides // Add the requires target to recursively build the provides
// target after needed information is up to date. // target after needed information is up to date.
std::vector<std::string> no_depends; std::vector<std::string> no_depends;
std::vector<std::string> commands; std::vector<std::string> r_commands;
commands.push_back(this->GetRecursiveMakeCall(objectProvides.c_str())); r_commands.push_back(this->GetRecursiveMakeCall(objectProvides.c_str()));
this->WriteMakeRule(ruleFileStream, 0, 0, this->WriteMakeRule(ruleFileStream, 0, 0,
objectRequires.c_str(), no_depends, commands); objectRequires.c_str(), no_depends, r_commands);
} }
// Add this to the set of provides-requires objects on the target. // Add this to the set of provides-requires objects on the target.