summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKen Martin <ken.martin@kitware.com>2005-08-05 21:07:07 (GMT)
committerKen Martin <ken.martin@kitware.com>2005-08-05 21:07:07 (GMT)
commitdce07caf0b59c120c0cc64199bf355842751fd19 (patch)
tree3d08a402b273234a283d34b9f1eec02b78015f7d
parentc8a44b42ad91fd3c45f378b9ac88e62b5c9ffc38 (diff)
downloadCMake-dce07caf0b59c120c0cc64199bf355842751fd19.zip
CMake-dce07caf0b59c120c0cc64199bf355842751fd19.tar.gz
CMake-dce07caf0b59c120c0cc64199bf355842751fd19.tar.bz2
ENH: fix warning
-rw-r--r--Source/cmGlobalUnixMakefileGenerator3.cxx4
-rw-r--r--Source/cmLocalUnixMakefileGenerator3.cxx8
-rw-r--r--Source/cmLocalUnixMakefileGenerator3.h2
3 files changed, 7 insertions, 7 deletions
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx
index 596ce97..a7e908d 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -138,7 +138,7 @@ void cmGlobalUnixMakefileGenerator3::WriteMainMakefile()
depends,
no_commands);
- lg->WriteMakeVariables(makefileStream, cmLocalGenerator::HOME_OUTPUT);
+ lg->WriteMakeVariables(makefileStream);
lg->WriteSpecialTargetsTop(makefileStream);
@@ -205,7 +205,7 @@ void cmGlobalUnixMakefileGenerator3::WriteMainMakefile2()
"The main recursive all target", "all",
no_commands, no_commands);
- lg->WriteMakeVariables(makefileStream,cmLocalGenerator::HOME_OUTPUT);
+ lg->WriteMakeVariables(makefileStream);
// write the target convenience rules
unsigned int i;
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index 1c91db7..4a7df0d 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -304,7 +304,7 @@ cmLocalUnixMakefileGenerator3
}
this->WriteDisclaimer(ruleFileStream);
- this->WriteMakeVariables(ruleFileStream, HOME_OUTPUT);
+ this->WriteMakeVariables(ruleFileStream);
// Open the flags file. This should be copy-if-different because the
// rules may depend on this file itself.
@@ -738,7 +738,7 @@ cmLocalUnixMakefileGenerator3
return;
}
this->WriteDisclaimer(ruleFileStream);
- this->WriteMakeVariables(ruleFileStream, HOME_OUTPUT);
+ this->WriteMakeVariables(ruleFileStream);
ruleFileStream
<< "# Utility rule file for " << target.GetName() << ".\n\n";
@@ -895,7 +895,7 @@ void cmLocalUnixMakefileGenerator3::WriteDivider(std::ostream& os)
//----------------------------------------------------------------------------
void
cmLocalUnixMakefileGenerator3
-::WriteMakeVariables(std::ostream& makefileStream, RelativeRoot root)
+::WriteMakeVariables(std::ostream& makefileStream)
{
this->WriteDivider(makefileStream);
makefileStream
@@ -2813,7 +2813,7 @@ void cmLocalUnixMakefileGenerator3::WriteLocalMakefile()
}
this->WriteDisclaimer(ruleFileStream);
- this->WriteMakeVariables(ruleFileStream, START_OUTPUT);
+ this->WriteMakeVariables(ruleFileStream);
this->WriteSpecialTargetsTop(ruleFileStream);
diff --git a/Source/cmLocalUnixMakefileGenerator3.h b/Source/cmLocalUnixMakefileGenerator3.h
index e3c05eb..ea70e6a 100644
--- a/Source/cmLocalUnixMakefileGenerator3.h
+++ b/Source/cmLocalUnixMakefileGenerator3.h
@@ -64,7 +64,7 @@ public:
const std::vector<std::string>& commands);
// write the main variables used by the makefiles
- void WriteMakeVariables(std::ostream& makefileStream, RelativeRoot root);
+ void WriteMakeVariables(std::ostream& makefileStream);
// write a comment line #====... in the stream
void WriteDivider(std::ostream& os);