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

Make GetCMakeInstance private and clean cxx file

This commit is contained in:
Andy Cedilnik 2003-01-14 09:53:13 -05:00
parent 587b067880
commit 5147742a83
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/cmMakefile.cxx
View File

@ -155,7 +155,7 @@ void cmMakefile::Print() const
bool cmMakefile::CommandExists(const char* name) const bool cmMakefile::CommandExists(const char* name) const
{ {
return m_LocalGenerator->GetGlobalGenerator()->GetCMakeInstance()->CommandExists(name); return this->GetCMakeInstance()->CommandExists(name);
} }
bool cmMakefile::ExecuteCommand(const cmListFileFunction& lff) bool cmMakefile::ExecuteCommand(const cmListFileFunction& lff)
@ -170,7 +170,7 @@ bool cmMakefile::ExecuteCommand(const cmListFileFunction& lff)
std::string name = lff.m_Name; std::string name = lff.m_Name;
// execute the command // execute the command
cmCommand *rm = cmCommand *rm =
m_LocalGenerator->GetGlobalGenerator()->GetCMakeInstance()->GetCommand(name.c_str()); this->GetCMakeInstance()->GetCommand(name.c_str());
if(rm) if(rm)
{ {
cmCommand* usedCommand = rm->Clone(); cmCommand* usedCommand = rm->Clone();
@ -349,7 +349,7 @@ bool cmMakefile::ReadListFile(const char* filename, const char* external)
void cmMakefile::AddCommand(cmCommand* wg) void cmMakefile::AddCommand(cmCommand* wg)
{ {
m_LocalGenerator->GetGlobalGenerator()->GetCMakeInstance()->AddCommand(wg); this->GetCMakeInstance()->AddCommand(wg);
} }
// Set the make file // Set the make file
@ -1497,12 +1497,12 @@ cmVariableWatch *cmMakefile::GetVariableWatch() const
cmCacheManager *cmMakefile::GetCacheManager() const cmCacheManager *cmMakefile::GetCacheManager() const
{ {
return m_LocalGenerator->GetGlobalGenerator()->GetCMakeInstance()->GetCacheManager(); return this->GetCMakeInstance()->GetCacheManager();
} }
bool cmMakefile::GetLocal() const bool cmMakefile::GetLocal() const
{ {
return m_LocalGenerator->GetGlobalGenerator()->GetCMakeInstance()->GetLocal(); return this->GetCMakeInstance()->GetLocal();
} }
void cmMakefile::DisplayStatus(const char* message, float s) void cmMakefile::DisplayStatus(const char* message, float s)
{ {

7
Source/cmMakefile.h
View File

@ -31,6 +31,7 @@ class cmLocalGenerator;
class cmMakeDepend; class cmMakeDepend;
class cmSourceFile; class cmSourceFile;
class cmVariableWatch; class cmVariableWatch;
class cmake;
/** \class cmMakefile /** \class cmMakefile
* \brief Process the input CMakeLists.txt file. * \brief Process the input CMakeLists.txt file.
@ -532,7 +533,6 @@ public:
* given a current CMakeLists file name * given a current CMakeLists file name
*/ */
cmCacheManager *GetCacheManager() const; cmCacheManager *GetCacheManager() const;
cmake *GetCMakeInstance() const;
cmVariableWatch* GetVariableWatch() const; cmVariableWatch* GetVariableWatch() const;
//! Determine wether this is a local or global build. //! Determine wether this is a local or global build.
@ -609,6 +609,11 @@ private:
void AddDefaultDefinitions(); void AddDefaultDefinitions();
std::list<cmFunctionBlocker *> m_FunctionBlockers; std::list<cmFunctionBlocker *> m_FunctionBlockers;
/**
* Get the instance
*/
cmake *GetCMakeInstance() const;
typedef std::map<cmStdString, cmData*> DataMap; typedef std::map<cmStdString, cmData*> DataMap;
DataMap m_DataMap; DataMap m_DataMap;
bool m_Inheriting; bool m_Inheriting;