summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKen Martin <ken.martin@kitware.com>2005-07-27 15:36:43 (GMT)
committerKen Martin <ken.martin@kitware.com>2005-07-27 15:36:43 (GMT)
commit33efcc442bbe8a2981113861e8f828732b72f127 (patch)
tree3ea66172120e8ac8dfc54a6fc51da69e4c80d924
parentccc292e4b0f0d0a5b8cd991b694163cc5b5435a0 (diff)
downloadCMake-33efcc442bbe8a2981113861e8f828732b72f127.zip
CMake-33efcc442bbe8a2981113861e8f828732b72f127.tar.gz
CMake-33efcc442bbe8a2981113861e8f828732b72f127.tar.bz2
ENH: fix some warnings and cleanup some
-rw-r--r--Source/cmLocalUnixMakefileGenerator3.cxx22
-rw-r--r--Source/cmLocalUnixMakefileGenerator3.h3
2 files changed, 4 insertions, 21 deletions
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index 4f09b1b..aab55f9 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -1192,7 +1192,7 @@ cmLocalUnixMakefileGenerator3
std::vector<std::string>& cleanFiles)
{
// Write the dependency generation rule.
- this->WriteTargetDependRule(ruleFileStream, target, objects);
+ this->WriteTargetDependRule(ruleFileStream, target);
std::vector<std::string> commands;
@@ -1505,7 +1505,7 @@ cmLocalUnixMakefileGenerator3
std::vector<std::string>& cleanFiles)
{
// Write the dependency generation rule.
- this->WriteTargetDependRule(ruleFileStream, target, objects);
+ this->WriteTargetDependRule(ruleFileStream, target);
// TODO: Merge the methods that call this method to avoid
// code duplication.
@@ -1780,9 +1780,7 @@ cmLocalUnixMakefileGenerator3
//----------------------------------------------------------------------------
void
cmLocalUnixMakefileGenerator3
-::WriteTargetDependRule(std::ostream& ruleFileStream,
- cmTarget& target,
- const std::vector<std::string>& objects)
+::WriteTargetDependRule(std::ostream& ruleFileStream, cmTarget& target)
{
// must write the targets depend info file
std::string dir = this->GetTargetDirectory(target);
@@ -1838,20 +1836,6 @@ cmLocalUnixMakefileGenerator3
// Write the rule.
this->WriteMakeRule(ruleFileStream, 0,
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
}
//----------------------------------------------------------------------------
diff --git a/Source/cmLocalUnixMakefileGenerator3.h b/Source/cmLocalUnixMakefileGenerator3.h
index 1a4fae2..8aa979f 100644
--- a/Source/cmLocalUnixMakefileGenerator3.h
+++ b/Source/cmLocalUnixMakefileGenerator3.h
@@ -285,8 +285,7 @@ protected:
std::string& variableName,
std::string& variableNameExternal);
void WriteTargetDependRule(std::ostream& ruleFileStream,
- cmTarget& target,
- const std::vector<std::string>& objects);
+ cmTarget& target);
void WriteTargetCleanRule(std::ostream& ruleFileStream,
cmTarget& target,
const std::vector<std::string>& files);