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

ENH: Do not generate touch rule for target level dependencies. There are no build-time dependencies by default.

Browse Source
This commit is contained in:
Brad King 2004-10-26 16:07:50 -04:00
parent d7aca58343
commit 18642f4b4e
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/cmLocalUnixMakefileGenerator2.cxx
View File

@ -308,7 +308,7 @@ cmLocalUnixMakefileGenerator2
if(!objects.empty()) if(!objects.empty())
{ {
ruleFileStream ruleFileStream
<< "# Include rules for object files.\n"; << "# Include make rules for object files.\n";
for(std::vector<std::string>::const_iterator obj = objects.begin(); for(std::vector<std::string>::const_iterator obj = objects.begin();
obj != objects.end(); ++obj) obj != objects.end(); ++obj)
{ {
@ -339,10 +339,6 @@ cmLocalUnixMakefileGenerator2
depends.push_back((*obj)+".depends"); depends.push_back((*obj)+".depends");
} }
depends.push_back(ruleFileName); depends.push_back(ruleFileName);
std::string touchCmd = "@touch ";
touchCmd += this->ConvertToRelativeOutputPath(depTarget.c_str());
// TODO: Construct dependency generation rule and append command.
commands.push_back(touchCmd);
this->OutputMakeRule(ruleFileStream, depComment.c_str(), depTarget.c_str(), this->OutputMakeRule(ruleFileStream, depComment.c_str(), depTarget.c_str(),
depends, commands); depends, commands);
} }
@ -474,7 +470,7 @@ cmLocalUnixMakefileGenerator2
depComment += objName; depComment += objName;
cmOStringStream depCmd; cmOStringStream depCmd;
// TODO: Account for source file properties and directory-level // TODO: Account for source file properties and directory-level
// definitions. // definitions when scanning for dependencies.
depCmd << "$(CMAKE_COMMAND) -E cmake_depends " << lang << " " depCmd << "$(CMAKE_COMMAND) -E cmake_depends " << lang << " "
<< this->ConvertToRelativeOutputPath(obj.c_str()) << " " << this->ConvertToRelativeOutputPath(obj.c_str()) << " "
<< this->ConvertToRelativeOutputPath(source.GetFullPath().c_str()); << this->ConvertToRelativeOutputPath(source.GetFullPath().c_str());