kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ENH: more cleanup and removal of old code

Browse Source
This commit is contained in:
Ken Martin 2006-01-30 14:25:07 -05:00
parent 5d35fd4b7e
commit 96d754046a
2 changed files with 9 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
Source/cmLocalUnixMakefileGenerator3.cxx
View File

@ -60,7 +60,14 @@ cmLocalUnixMakefileGenerator3::~cmLocalUnixMakefileGenerator3()
//----------------------------------------------------------------------------
void cmLocalUnixMakefileGenerator3::Configure()
{
this->ComputeHomeRelativeOutputPath();
// Include the rule file for each object.
m_HomeRelativeOutputPath =
cmSystemTools::RelativePath(m_Makefile->GetHomeOutputDirectory(),
m_Makefile->GetStartOutputDirectory());
if (m_HomeRelativeOutputPath.size())
{
m_HomeRelativeOutputPath += "/";
}
this->cmLocalGenerator::Configure();
}
@ -297,18 +304,6 @@ void cmLocalUnixMakefileGenerator3::WriteDisclaimer(std::ostream& os)
<< cmMakefile::GetMinorVersion() << "\n\n";
}
void cmLocalUnixMakefileGenerator3::ComputeHomeRelativeOutputPath()
{
// Include the rule file for each object.
m_HomeRelativeOutputPath =
cmSystemTools::RelativePath(m_Makefile->GetHomeOutputDirectory(),
m_Makefile->GetStartOutputDirectory());
if (m_HomeRelativeOutputPath.size())
{
m_HomeRelativeOutputPath += "/";
}
}
const std::string &cmLocalUnixMakefileGenerator3::GetHomeRelativeOutputPath()
{
return m_HomeRelativeOutputPath;
@ -897,26 +892,6 @@ cmLocalUnixMakefileGenerator3
this->WriteTargetCleanRule(ruleFileStream, target, cleanFiles);
}
//----------------------------------------------------------------------------
bool
cmLocalUnixMakefileGenerator3
::GenerateDependsMakeFile(const std::string& lang, const char* objFile)
{
// Construct a checker for the given language.
std::auto_ptr<cmDepends>
checker(this->GetDependsChecker(lang,false));
if(checker.get())
{
// Check the dependencies. Ths is required because we need at least an
// empty depends.make for make to include, so at cmake time the
// ::Check() method will generate that if it does not exist
checker->Check(objFile, 0);
return true;
}
return false;
}
//----------------------------------------------------------------------------
void
cmLocalUnixMakefileGenerator3
@ -2505,24 +2480,6 @@ cmLocalUnixMakefileGenerator3::AppendEcho(std::vector<std::string>& commands,
}
}
//============================================================================
//----------------------------------------------------------------------------
bool
cmLocalUnixMakefileGenerator3::SamePath(const char* path1, const char* path2)
{
if (strcmp(path1, path2) == 0)
{
return true;
}
#if defined(_WIN32) || defined(__APPLE__)
return
(cmSystemTools::LowerCase(this->ConvertToOutputForExisting(path1)) ==
cmSystemTools::LowerCase(this->ConvertToOutputForExisting(path2)));
#else
return false;
#endif
}
//----------------------------------------------------------------------------
// take a tgt path and convert it into a make target, it could be full, or relative
std::string
@ -2678,35 +2635,6 @@ cmLocalUnixMakefileGenerator3
m_MakeVariableMap[unmodified] = ret;
return ret;
}
//============================================================================
//----------------------------------------------------------------------------
cmDepends*
cmLocalUnixMakefileGenerator3::GetDependsChecker(const std::string& lang,
bool verbose)
{
cmDepends *ret = 0;
if(lang == "C" || lang == "CXX" || lang == "RC")
{
ret = new cmDependsC();
}
#ifdef CMAKE_BUILD_WITH_CMAKE
else if(lang == "Fortran")
{
ret = new cmDependsFortran();
}
else if(lang == "Java")
{
ret = new cmDependsJava();
}
#endif
if (ret)
{
ret->SetVerbose(verbose);
ret->SetFileComparison(m_GlobalGenerator->GetCMakeInstance()->GetFileComparison());
}
return ret;
}
//----------------------------------------------------------------------------
bool
@ -3283,7 +3211,4 @@ void cmLocalUnixMakefileGenerator3
}
cmakefileStream << " )\n";
}
}

19
Source/cmLocalUnixMakefileGenerator3.h
View File

@ -84,12 +84,7 @@ public:
std::string &GetMakeSilentFlag() { return m_MakeSilentFlag; }
/** used to create a recursive make call */
std::string GetRecursiveMakeCall(const char *makefile, const char* tgt);
std::string GetRecursiveMakeCall(const char *makefile, const char* tgt);
/** Set whether the echo command needs its argument quoted. */
@ -243,15 +238,6 @@ protected:
void WriteObjectDependRules(cmSourceFile& source,
std::vector<std::string>& depends);
// this is used only by WriteObjectDependFile
bool GenerateDependsMakeFile(const std::string& lang,
const char* objFile);
// return the appropriate depends checker
cmDepends* GetDependsChecker(const std::string& lang,
bool verbose);
void GenerateCustomRuleFile(const cmCustomCommand& cc,
std::ostream &ruleStream);
@ -337,13 +323,10 @@ protected:
const std::vector<std::string>& files);
//==========================================================================
bool SamePath(const char* path1, const char* path2);
std::string& CreateSafeUniqueObjectFileName(const char* sin);
std::string CreateMakeVariable(const char* sin, const char* s2in);
//==========================================================================
void ComputeHomeRelativeOutputPath();
private:
std::map<cmStdString, IntegrityCheckSetMap> m_CheckDependFiles;