ENH: fix some warnings and cleanup some
This commit is contained in:
parent
6cc7bca222
commit
ccc292e4b0
|
@ -423,10 +423,7 @@ cmLocalUnixMakefileGenerator3
|
||||||
//----------------------------------------------------------------------------
|
//----------------------------------------------------------------------------
|
||||||
void
|
void
|
||||||
cmLocalUnixMakefileGenerator3
|
cmLocalUnixMakefileGenerator3
|
||||||
::WriteObjectDependRules(std::ostream& ruleFileStream,
|
::WriteObjectDependRules(cmSourceFile& source,
|
||||||
std::string &obj,
|
|
||||||
const char * lang,
|
|
||||||
cmSourceFile& source,
|
|
||||||
std::vector<std::string>& depends)
|
std::vector<std::string>& depends)
|
||||||
{
|
{
|
||||||
// Create the list of dependencies known at cmake time. These are
|
// Create the list of dependencies known at cmake time. These are
|
||||||
|
@ -462,7 +459,7 @@ cmLocalUnixMakefileGenerator3
|
||||||
std::string ruleFileNameFull = this->ConvertToFullPath(ruleFileName);
|
std::string ruleFileNameFull = this->ConvertToFullPath(ruleFileName);
|
||||||
|
|
||||||
// generate the depend scanning rule
|
// generate the depend scanning rule
|
||||||
this->WriteObjectDependRules(ruleFileStream, obj, lang, source, depends);
|
this->WriteObjectDependRules(source, depends);
|
||||||
|
|
||||||
this->AppendRuleDepend(depends, ruleFileNameFull.c_str());
|
this->AppendRuleDepend(depends, ruleFileNameFull.c_str());
|
||||||
|
|
||||||
|
|
|
@ -212,10 +212,7 @@ protected:
|
||||||
std::ostream &filestr);
|
std::ostream &filestr);
|
||||||
|
|
||||||
// write the depend.make file for an object
|
// write the depend.make file for an object
|
||||||
void WriteObjectDependRules(std::ostream& ruleFileStream,
|
void WriteObjectDependRules(cmSourceFile& source,
|
||||||
std::string& obj,
|
|
||||||
const char *lang,
|
|
||||||
cmSourceFile& source,
|
|
||||||
std::vector<std::string>& depends);
|
std::vector<std::string>& depends);
|
||||||
|
|
||||||
// this is used only by WriteObjectDependFile
|
// this is used only by WriteObjectDependFile
|
||||||
|
|
Loading…
Reference in New Issue