summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2004-10-26 20:07:50 (GMT)
committerBrad King <brad.king@kitware.com>2004-10-26 20:07:50 (GMT)
commit18642f4b4e7467534f6c4a66e276a57532c25de6 (patch)
tree7bf4eddf2c911a79701f1755a8ae520e1e227637
parentd7aca58343c0c35844391903629752daefc9da8a (diff)
downloadCMake-18642f4b4e7467534f6c4a66e276a57532c25de6.zip
CMake-18642f4b4e7467534f6c4a66e276a57532c25de6.tar.gz
CMake-18642f4b4e7467534f6c4a66e276a57532c25de6.tar.bz2
ENH: Do not generate touch rule for target level dependencies. There are no build-time dependencies by default.
-rw-r--r--Source/cmLocalUnixMakefileGenerator2.cxx8
1 files changed, 2 insertions, 6 deletions
diff --git a/Source/cmLocalUnixMakefileGenerator2.cxx b/Source/cmLocalUnixMakefileGenerator2.cxx
index cf5adb7..cbb67cd 100644
--- a/Source/cmLocalUnixMakefileGenerator2.cxx
+++ b/Source/cmLocalUnixMakefileGenerator2.cxx
@@ -308,7 +308,7 @@ cmLocalUnixMakefileGenerator2
if(!objects.empty())
{
ruleFileStream
- << "# Include rules for object files.\n";
+ << "# Include make rules for object files.\n";
for(std::vector<std::string>::const_iterator obj = objects.begin();
obj != objects.end(); ++obj)
{
@@ -339,10 +339,6 @@ cmLocalUnixMakefileGenerator2
depends.push_back((*obj)+".depends");
}
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(),
depends, commands);
}
@@ -474,7 +470,7 @@ cmLocalUnixMakefileGenerator2
depComment += objName;
cmOStringStream depCmd;
// TODO: Account for source file properties and directory-level
- // definitions.
+ // definitions when scanning for dependencies.
depCmd << "$(CMAKE_COMMAND) -E cmake_depends " << lang << " "
<< this->ConvertToRelativeOutputPath(obj.c_str()) << " "
<< this->ConvertToRelativeOutputPath(source.GetFullPath().c_str());