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

ENH: Removed unneeded requires rules now that canonical names are available.

This commit is contained in:
Brad King 2004-11-03 08:59:13 -05:00
parent 8a4c0673be
commit 30e685b41f
2 changed files with 5 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
Source/cmLocalUnixMakefileGenerator2.cxx
View File

@ -974,13 +974,15 @@ cmLocalUnixMakefileGenerator2
// Special target to cleanup operation of make tool. // Special target to cleanup operation of make tool.
std::vector<std::string> depends; std::vector<std::string> depends;
depends.push_back(".hpux_make_must_have_this_dependency_here");
this->WriteMakeRule(makefileStream, this->WriteMakeRule(makefileStream,
"Disable some common implicit rules to speed things up.", "Disable implicit rules so canoncical targets will work.",
0, 0,
".SUFFIXES", ".SUFFIXES",
depends, depends,
no_commands); no_commands);
depends.push_back(".hpux_make_must_have_suffixes_list");
this->WriteMakeRule(makefileStream, 0, 0,
".SUFFIXES", depends, no_commands);
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
@ -1048,7 +1050,7 @@ cmLocalUnixMakefileGenerator2
{ {
if(t->second.IsInAll()) if(t->second.IsInAll())
{ {
depends.push_back(t->first+".requires"); depends.push_back(t->first);
} }
} }
} }
@ -1219,25 +1221,6 @@ cmLocalUnixMakefileGenerator2
tgt.c_str(), depends, commands); tgt.c_str(), depends, commands);
} }
//----------------------------------------------------------------------------
void
cmLocalUnixMakefileGenerator2
::WriteRequiresRule(std::ostream& ruleFileStream, const cmTarget& target,
const char* targetFullPath)
{
// TODO: Avoid using requires target except when needed for
// Fortran/Java dependencies.
std::vector<std::string> depends;
std::vector<std::string> no_commands;
std::string reqComment = "Requirements for target ";
reqComment += target.GetName();
std::string reqTarget = target.GetName();
reqTarget += ".requires";
depends.push_back(targetFullPath);
this->WriteMakeRule(ruleFileStream, reqComment.c_str(), 0,
reqTarget.c_str(), depends, no_commands);
}
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
void void
cmLocalUnixMakefileGenerator2 cmLocalUnixMakefileGenerator2
@ -1448,9 +1431,6 @@ cmLocalUnixMakefileGenerator2
// Write convenience targets. // Write convenience targets.
this->WriteConvenienceRules(ruleFileStream, target, targetFullPath.c_str()); this->WriteConvenienceRules(ruleFileStream, target, targetFullPath.c_str());
// Write driver rule for this target.
this->WriteRequiresRule(ruleFileStream, target, targetFullPath.c_str());
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
@ -1702,9 +1682,6 @@ cmLocalUnixMakefileGenerator2
// Write convenience targets. // Write convenience targets.
this->WriteConvenienceRules(ruleFileStream, target, targetFullPath.c_str()); this->WriteConvenienceRules(ruleFileStream, target, targetFullPath.c_str());
// Write driver rule for this target.
this->WriteRequiresRule(ruleFileStream, target, targetFullPath.c_str());
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
@ -2087,7 +2064,6 @@ cmLocalUnixMakefileGenerator2
dep += ".depends"; dep += ".depends";
dep = this->ConvertToRelativeOutputPath(dep.c_str()); dep = this->ConvertToRelativeOutputPath(dep.c_str());
std::string tgt = jump->first; std::string tgt = jump->first;
tgt += ".requires";
tgt = this->ConvertToRelativeOutputPath(tgt.c_str()); tgt = this->ConvertToRelativeOutputPath(tgt.c_str());
// Build the jump-and-build command list. // Build the jump-and-build command list.

2
Source/cmLocalUnixMakefileGenerator2.h
View File

@ -87,8 +87,6 @@ protected:
const char* subdir, std::string& last); const char* subdir, std::string& last);
void WriteSubdirDriverRule(std::ostream& makefileStream, const char* pass, void WriteSubdirDriverRule(std::ostream& makefileStream, const char* pass,
const char* order, const std::string& last); const char* order, const std::string& last);
void WriteRequiresRule(std::ostream& ruleFileStream, const cmTarget& target,
const char* targetFullPath);
void WriteConvenienceRules(std::ostream& ruleFileStream, void WriteConvenienceRules(std::ostream& ruleFileStream,
const cmTarget& target, const cmTarget& target,
const char* targetFullPath); const char* targetFullPath);