cmState: Store the Source and Binary directories.
This commit is contained in:
parent
86f3cd0f7e
commit
ae6c8a9d68
|
@ -444,3 +444,25 @@ bool cmState::GetGlobalPropertyAsBool(const std::string& prop)
|
||||||
{
|
{
|
||||||
return cmSystemTools::IsOn(this->GetGlobalProperty(prop));
|
return cmSystemTools::IsOn(this->GetGlobalProperty(prop));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void cmState::SetSourceDirectory(std::string const& sourceDirectory)
|
||||||
|
{
|
||||||
|
this->SourceDirectory = sourceDirectory;
|
||||||
|
cmSystemTools::ConvertToUnixSlashes(this->SourceDirectory);
|
||||||
|
}
|
||||||
|
|
||||||
|
const char* cmState::GetSourceDirectory() const
|
||||||
|
{
|
||||||
|
return this->SourceDirectory.c_str();
|
||||||
|
}
|
||||||
|
|
||||||
|
void cmState::SetBinaryDirectory(std::string const& binaryDirectory)
|
||||||
|
{
|
||||||
|
this->BinaryDirectory = binaryDirectory;
|
||||||
|
cmSystemTools::ConvertToUnixSlashes(this->BinaryDirectory);
|
||||||
|
}
|
||||||
|
|
||||||
|
const char* cmState::GetBinaryDirectory() const
|
||||||
|
{
|
||||||
|
return this->BinaryDirectory.c_str();
|
||||||
|
}
|
||||||
|
|
|
@ -95,12 +95,19 @@ public:
|
||||||
const char *GetGlobalProperty(const std::string& prop);
|
const char *GetGlobalProperty(const std::string& prop);
|
||||||
bool GetGlobalPropertyAsBool(const std::string& prop);
|
bool GetGlobalPropertyAsBool(const std::string& prop);
|
||||||
|
|
||||||
|
const char* GetSourceDirectory() const;
|
||||||
|
void SetSourceDirectory(std::string const& sourceDirectory);
|
||||||
|
const char* GetBinaryDirectory() const;
|
||||||
|
void SetBinaryDirectory(std::string const& binaryDirectory);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
std::map<cmProperty::ScopeType, cmPropertyDefinitionMap> PropertyDefinitions;
|
std::map<cmProperty::ScopeType, cmPropertyDefinitionMap> PropertyDefinitions;
|
||||||
std::vector<std::string> EnabledLanguages;
|
std::vector<std::string> EnabledLanguages;
|
||||||
std::map<std::string, cmCommand*> Commands;
|
std::map<std::string, cmCommand*> Commands;
|
||||||
cmPropertyMap GlobalProperties;
|
cmPropertyMap GlobalProperties;
|
||||||
cmake* CMakeInstance;
|
cmake* CMakeInstance;
|
||||||
|
std::string SourceDirectory;
|
||||||
|
std::string BinaryDirectory;
|
||||||
bool IsInTryCompile;
|
bool IsInTryCompile;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -978,24 +978,22 @@ cmGlobalGenerator* cmake::CreateGlobalGenerator(const std::string& gname)
|
||||||
|
|
||||||
void cmake::SetHomeDirectory(const std::string& dir)
|
void cmake::SetHomeDirectory(const std::string& dir)
|
||||||
{
|
{
|
||||||
this->cmHomeDirectory = dir;
|
this->State->SetSourceDirectory(dir);
|
||||||
cmSystemTools::ConvertToUnixSlashes(this->cmHomeDirectory);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const char* cmake::GetHomeDirectory() const
|
const char* cmake::GetHomeDirectory() const
|
||||||
{
|
{
|
||||||
return this->cmHomeDirectory.c_str();
|
return this->State->GetSourceDirectory();
|
||||||
}
|
}
|
||||||
|
|
||||||
void cmake::SetHomeOutputDirectory(const std::string& dir)
|
void cmake::SetHomeOutputDirectory(const std::string& dir)
|
||||||
{
|
{
|
||||||
this->HomeOutputDirectory = dir;
|
this->State->SetBinaryDirectory(dir);
|
||||||
cmSystemTools::ConvertToUnixSlashes(this->HomeOutputDirectory);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const char* cmake::GetHomeOutputDirectory() const
|
const char* cmake::GetHomeOutputDirectory() const
|
||||||
{
|
{
|
||||||
return this->HomeOutputDirectory.c_str();
|
return this->State->GetBinaryDirectory();
|
||||||
}
|
}
|
||||||
|
|
||||||
void cmake::SetGlobalGenerator(cmGlobalGenerator *gg)
|
void cmake::SetGlobalGenerator(cmGlobalGenerator *gg)
|
||||||
|
|
|
@ -336,8 +336,6 @@ protected:
|
||||||
cmPolicies *Policies;
|
cmPolicies *Policies;
|
||||||
cmGlobalGenerator *GlobalGenerator;
|
cmGlobalGenerator *GlobalGenerator;
|
||||||
cmCacheManager *CacheManager;
|
cmCacheManager *CacheManager;
|
||||||
std::string cmHomeDirectory;
|
|
||||||
std::string HomeOutputDirectory;
|
|
||||||
bool SuppressDevWarnings;
|
bool SuppressDevWarnings;
|
||||||
bool DoSuppressDevWarnings;
|
bool DoSuppressDevWarnings;
|
||||||
std::string GeneratorPlatform;
|
std::string GeneratorPlatform;
|
||||||
|
|
Loading…
Reference in New Issue