Save directories when doing global build

This commit is contained in:
Andy Cedilnik 2002-12-17 12:11:48 -05:00
parent a37a934410
commit 2fb76a9f07
1 changed files with 5 additions and 0 deletions

View File

@ -881,6 +881,8 @@ int cmake::Run(const std::vector<std::string>& args)
{ {
// If we are doing global generate, we better set start and start // If we are doing global generate, we better set start and start
// output directory to the root of the project. // output directory to the root of the project.
std::string oldstartdir = this->GetStartDirectory();
std::string oldstartoutputdir = this->GetStartOutputDirectory();
this->SetStartDirectory(this->GetHomeDirectory()); this->SetStartDirectory(this->GetHomeDirectory());
this->SetStartOutputDirectory(this->GetHomeOutputDirectory()); this->SetStartOutputDirectory(this->GetHomeOutputDirectory());
bool saveLocalFlag = m_Local; bool saveLocalFlag = m_Local;
@ -896,7 +898,10 @@ int cmake::Run(const std::vector<std::string>& args)
return ret; return ret;
} }
m_Local = saveLocalFlag; m_Local = saveLocalFlag;
this->SetStartDirectory(oldstartdir.c_str());
this->SetStartOutputDirectory(oldstartoutputdir.c_str());
} }
// if we are local do the local thing // if we are local do the local thing
if (m_Local) if (m_Local)
{ {