diff options
author | Brad King <brad.king@kitware.com> | 2005-01-29 12:57:21 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2005-01-29 12:57:21 (GMT) |
commit | 52b533ce2b4ed276affdbdf1a0ad11d68b4ea5fa (patch) | |
tree | e5e31857c5efae19d89ddbca854c989a845cbbf0 | |
parent | 0ab7b0988c00aa6a21d6427516cf8b0cef3b3946 (diff) | |
download | CMake-52b533ce2b4ed276affdbdf1a0ad11d68b4ea5fa.zip CMake-52b533ce2b4ed276affdbdf1a0ad11d68b4ea5fa.tar.gz CMake-52b533ce2b4ed276affdbdf1a0ad11d68b4ea5fa.tar.bz2 |
COMP: Removed shadowed variable warning.
-rw-r--r-- | Source/cmLocalUnixMakefileGenerator2.cxx | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/Source/cmLocalUnixMakefileGenerator2.cxx b/Source/cmLocalUnixMakefileGenerator2.cxx index c2ff9ee..321760f 100644 --- a/Source/cmLocalUnixMakefileGenerator2.cxx +++ b/Source/cmLocalUnixMakefileGenerator2.cxx @@ -382,6 +382,7 @@ cmLocalUnixMakefileGenerator2 } // Get the full path name of the object file. + // TODO: Remove duplicate objects and warn. std::string obj = this->GetObjectFileName(target, source); // 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. std::vector<std::string> no_commands; - std::vector<std::string> depends; - depends.push_back(obj); + std::vector<std::string> p_depends; + p_depends.push_back(obj); 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 // target after needed information is up to date. std::vector<std::string> no_depends; - std::vector<std::string> commands; - commands.push_back(this->GetRecursiveMakeCall(objectProvides.c_str())); + std::vector<std::string> r_commands; + r_commands.push_back(this->GetRecursiveMakeCall(objectProvides.c_str())); 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. |