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

ENH: fix some warnings and cleanup some

This commit is contained in:
Ken Martin 2005-07-27 11:36:43 -04:00
parent ccc292e4b0
commit 33efcc442b
2 changed files with 4 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Source/cmLocalUnixMakefileGenerator3.cxx
View File

@ -1192,7 +1192,7 @@ cmLocalUnixMakefileGenerator3
std::vector<std::string>& cleanFiles) std::vector<std::string>& cleanFiles)
{ {
// Write the dependency generation rule. // Write the dependency generation rule.
this->WriteTargetDependRule(ruleFileStream, target, objects); this->WriteTargetDependRule(ruleFileStream, target);
std::vector<std::string> commands; std::vector<std::string> commands;
@ -1505,7 +1505,7 @@ cmLocalUnixMakefileGenerator3
std::vector<std::string>& cleanFiles) std::vector<std::string>& cleanFiles)
{ {
// Write the dependency generation rule. // Write the dependency generation rule.
this->WriteTargetDependRule(ruleFileStream, target, objects); this->WriteTargetDependRule(ruleFileStream, target);
// TODO: Merge the methods that call this method to avoid // TODO: Merge the methods that call this method to avoid
// code duplication. // code duplication.
@ -1780,9 +1780,7 @@ cmLocalUnixMakefileGenerator3
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
void void
cmLocalUnixMakefileGenerator3 cmLocalUnixMakefileGenerator3
::WriteTargetDependRule(std::ostream& ruleFileStream, ::WriteTargetDependRule(std::ostream& ruleFileStream, cmTarget& target)
cmTarget& target,
const std::vector<std::string>& objects)
{ {
// must write the targets depend info file // must write the targets depend info file
std::string dir = this->GetTargetDirectory(target); std::string dir = this->GetTargetDirectory(target);
@ -1838,20 +1836,6 @@ cmLocalUnixMakefileGenerator3
// Write the rule. // Write the rule.
this->WriteMakeRule(ruleFileStream, 0, this->WriteMakeRule(ruleFileStream, 0,
depMark.c_str(), depends, commands); depMark.c_str(), depends, commands);
#if 0
// This target drives dependency generation for all object files.
std::string relPath = this->GetHomeRelativeOutputPath();
std::string objTarget;
for(std::vector<std::string>::const_iterator obj = objects.begin();
obj != objects.end(); ++obj)
{
objTarget = relPath;
objTarget += *obj;
objTarget += ".depend";
depends.push_back(objTarget);
}
#endif
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------

3
Source/cmLocalUnixMakefileGenerator3.h
View File

@ -285,8 +285,7 @@ protected:
std::string& variableName, std::string& variableName,
std::string& variableNameExternal); std::string& variableNameExternal);
void WriteTargetDependRule(std::ostream& ruleFileStream, void WriteTargetDependRule(std::ostream& ruleFileStream,
cmTarget& target, cmTarget& target);
const std::vector<std::string>& objects);
void WriteTargetCleanRule(std::ostream& ruleFileStream, void WriteTargetCleanRule(std::ostream& ruleFileStream,
cmTarget& target, cmTarget& target,
const std::vector<std::string>& files); const std::vector<std::string>& files);