echo/CMake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ENH: fix some warnings and cleanup some

Browse Source
This commit is contained in:
Ken Martin 2005-07-27 11:31:17 -04:00
parent f85f919dbc
commit 6cc7bca222
4 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/cmDependsJava.cxx
View File

@ -31,7 +31,7 @@ cmDependsJava::~cmDependsJava()
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
bool cmDependsJava::WriteDependencies(const char *src, bool cmDependsJava::WriteDependencies(const char *src,
const char *file, std::ostream&) const char *, std::ostream&)
{ {
// Make sure this is a scanning instance. // Make sure this is a scanning instance.
if(!src || src[0] == '\0') if(!src || src[0] == '\0')

8
Source/cmGlobalUnixMakefileGenerator3.cxx
View File

@ -982,10 +982,10 @@ bool cmGlobalUnixMakefileGenerator3
cmLocalUnixMakefileGenerator3::IntegrityCheckSet>::const_iterator cmLocalUnixMakefileGenerator3::IntegrityCheckSet>::const_iterator
l = checkSet.begin(); l != checkSet.end(); ++l) l = checkSet.begin(); l != checkSet.end(); ++l)
{ {
std::string name = "CMAKE_NEEDS_REQUIRES_STEP_"; std::string name2 = "CMAKE_NEEDS_REQUIRES_STEP_";
name += l->first; name2 += l->first;
name += "_FLAG"; name2 += "_FLAG";
if(lg->GetMakefile()->GetDefinition(name.c_str())) if(lg->GetMakefile()->GetDefinition(name2.c_str()))
{ {
return true; return true;
} }

12
Source/cmLocalUnixMakefileGenerator3.cxx
View File

@ -427,8 +427,7 @@ cmLocalUnixMakefileGenerator3
std::string &obj, std::string &obj,
const char * lang, const char * lang,
cmSourceFile& source, cmSourceFile& source,
std::vector<std::string>& depends, std::vector<std::string>& depends)
std::string& depMakeFile)
{ {
// Create the list of dependencies known at cmake time. These are // Create the list of dependencies known at cmake time. These are
// shared between the object file and dependency scanning rule. // shared between the object file and dependency scanning rule.
@ -454,7 +453,6 @@ cmLocalUnixMakefileGenerator3
cmTarget& target, cmTarget& target,
cmSourceFile& source, cmSourceFile& source,
std::vector<std::string>& depends, std::vector<std::string>& depends,
std::string &depMakeFile,
std::ostream &ruleFileStream) std::ostream &ruleFileStream)
{ {
// Open the rule file for writing. This should be copy-if-different // Open the rule file for writing. This should be copy-if-different
@ -464,8 +462,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, this->WriteObjectDependRules(ruleFileStream, obj, lang, source, depends);
depends, depMakeFile);
this->AppendRuleDepend(depends, ruleFileNameFull.c_str()); this->AppendRuleDepend(depends, ruleFileNameFull.c_str());
@ -636,7 +633,7 @@ cmLocalUnixMakefileGenerator3
std::string depMakeFile; std::string depMakeFile;
// generate the build rule file // generate the build rule file
this->WriteObjectBuildFile(obj, lang, target, source, depends, depMakeFile, this->WriteObjectBuildFile(obj, lang, target, source, depends,
ruleFileStream); ruleFileStream);
// The object file should be checked for dependency integrity. // The object file should be checked for dependency integrity.
@ -753,8 +750,7 @@ cmLocalUnixMakefileGenerator3
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
bool bool
cmLocalUnixMakefileGenerator3 cmLocalUnixMakefileGenerator3
::GenerateDependsMakeFile(const std::string& lang, const char* objFile, ::GenerateDependsMakeFile(const std::string& lang, const char* objFile)
std::string& depMakeFile, std::string& depMarkFile)
{ {
// Construct a checker for the given language. // Construct a checker for the given language.
std::auto_ptr<cmDepends> std::auto_ptr<cmDepends>

8
Source/cmLocalUnixMakefileGenerator3.h
View File

@ -209,7 +209,6 @@ protected:
cmTarget& target, cmTarget& target,
cmSourceFile& source, cmSourceFile& source,
std::vector<std::string>& depends, std::vector<std::string>& depends,
std::string &depMakeFile,
std::ostream &filestr); std::ostream &filestr);
// write the depend.make file for an object // write the depend.make file for an object
@ -217,14 +216,11 @@ protected:
std::string& obj, std::string& obj,
const char *lang, const char *lang,
cmSourceFile& source, cmSourceFile& source,
std::vector<std::string>& depends, std::vector<std::string>& depends);
std::string& depMarkFile);
// this is used only by WriteObjectDependFile // this is used only by WriteObjectDependFile
bool GenerateDependsMakeFile(const std::string& lang, bool GenerateDependsMakeFile(const std::string& lang,
const char* objFile, const char* objFile);
std::string& depMakeFile,
std::string& depMarkFile);
// return the appropriate depends checker // return the appropriate depends checker
cmDepends* GetDependsChecker(const std::string& lang, cmDepends* GetDependsChecker(const std::string& lang,