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

cmMakefile: Inline SetHome* methods into last remaining caller.

This commit is contained in:
Stephen Kelly 2015-04-26 19:53:06 +02:00
parent 410f39a43e
commit e4c78b37ce
2 changed files with 17 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
Source/cmMakefile.cxx
View File

@ -651,9 +651,23 @@ void cmMakefile::SetLocalGenerator(cmLocalGenerator* lg)
this->Properties.SetCMakeInstance(this->GetCMakeInstance()); this->Properties.SetCMakeInstance(this->GetCMakeInstance());
this->WarnUnused = this->GetCMakeInstance()->GetWarnUnused(); this->WarnUnused = this->GetCMakeInstance()->GetWarnUnused();
this->CheckSystemVars = this->GetCMakeInstance()->GetCheckSystemVars(); this->CheckSystemVars = this->GetCMakeInstance()->GetCheckSystemVars();
this->SetHomeDirectory(this->GetCMakeInstance()->GetHomeDirectory());
this->SetHomeOutputDirectory( {
this->GetCMakeInstance()->GetHomeOutputDirectory()); const char* dir = this->GetCMakeInstance()->GetHomeDirectory();
this->AddDefinition("CMAKE_SOURCE_DIR", dir);
if ( !this->GetDefinition("CMAKE_CURRENT_SOURCE_DIR") )
{
this->AddDefinition("CMAKE_CURRENT_SOURCE_DIR", dir);
}
}
{
const char* dir = this->GetCMakeInstance()->GetHomeOutputDirectory();
this->AddDefinition("CMAKE_BINARY_DIR", dir);
if ( !this->GetDefinition("CMAKE_CURRENT_BINARY_DIR") )
{
this->AddDefinition("CMAKE_CURRENT_BINARY_DIR", dir);
}
}
} }
namespace namespace
@ -3385,29 +3399,11 @@ const char* cmMakefile::GetHomeDirectory() const
return this->GetCMakeInstance()->GetHomeDirectory(); return this->GetCMakeInstance()->GetHomeDirectory();
} }
void cmMakefile::SetHomeDirectory(const std::string& dir)
{
this->AddDefinition("CMAKE_SOURCE_DIR", dir.c_str());
if ( !this->GetDefinition("CMAKE_CURRENT_SOURCE_DIR") )
{
this->AddDefinition("CMAKE_CURRENT_SOURCE_DIR", dir.c_str());
}
}
const char* cmMakefile::GetHomeOutputDirectory() const const char* cmMakefile::GetHomeOutputDirectory() const
{ {
return this->GetCMakeInstance()->GetHomeOutputDirectory(); return this->GetCMakeInstance()->GetHomeOutputDirectory();
} }
void cmMakefile::SetHomeOutputDirectory(const std::string& dir)
{
this->AddDefinition("CMAKE_BINARY_DIR", dir.c_str());
if ( !this->GetDefinition("CMAKE_CURRENT_BINARY_DIR") )
{
this->AddDefinition("CMAKE_CURRENT_BINARY_DIR", dir.c_str());
}
}
void cmMakefile::SetScriptModeFile(const char* scriptfile) void cmMakefile::SetScriptModeFile(const char* scriptfile)
{ {
this->AddDefinition("CMAKE_SCRIPT_MODE_FILE", scriptfile); this->AddDefinition("CMAKE_SCRIPT_MODE_FILE", scriptfile);

11
Source/cmMakefile.h
View File

@ -422,19 +422,8 @@ public:
bool HasCMP0054AlreadyBeenReported( bool HasCMP0054AlreadyBeenReported(
cmListFileContext context) const; cmListFileContext context) const;
//@{
/**
* Set/Get the home directory (or output directory) in the project. The
* home directory is the top directory of the project. It is where
* CMakeSetup or configure was run. Remember that CMake processes
* CMakeLists files by recursing up the tree starting at the StartDirectory
* and going up until it reaches the HomeDirectory.
*/
void SetHomeDirectory(const std::string& dir);
const char* GetHomeDirectory() const; const char* GetHomeDirectory() const;
void SetHomeOutputDirectory(const std::string& dir);
const char* GetHomeOutputDirectory() const; const char* GetHomeOutputDirectory() const;
//@}
/** /**
* Set CMAKE_SCRIPT_MODE_FILE variable when running a -P script. * Set CMAKE_SCRIPT_MODE_FILE variable when running a -P script.