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

Don't warn during configure when doing everything

Browse Source 
This prevents warnings from being generated after configure *and* after
generation if both are going to be run anyways.
This commit is contained in:
Ben Boeckel 2010-11-15 11:01:19 -05:00
parent b97ee21fc6
commit 447a04c31c
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/cmake.cxx
View File

@ -2292,6 +2292,11 @@ int cmake::Run(const std::vector<std::string>& args, bool noconfigure)
std::string oldstartoutputdir = this->GetStartOutputDirectory(); std::string oldstartoutputdir = this->GetStartOutputDirectory();
this->SetStartDirectory(this->GetHomeDirectory()); this->SetStartDirectory(this->GetHomeDirectory());
this->SetStartOutputDirectory(this->GetHomeOutputDirectory()); this->SetStartOutputDirectory(this->GetHomeOutputDirectory());
const bool warncli = this->WarnUnusedCli;
if (!this->ScriptMode)
{
this->WarnUnusedCli = false;
}
int ret = this->Configure(); int ret = this->Configure();
if (ret || this->ScriptMode) if (ret || this->ScriptMode)
{ {
@ -2313,6 +2318,7 @@ int cmake::Run(const std::vector<std::string>& args, bool noconfigure)
#endif #endif
return ret; return ret;
} }
this->WarnUnusedCli = warncli;
ret = this->Generate(); ret = this->Generate();
std::string message = "Build files have been written to: "; std::string message = "Build files have been written to: ";
message += this->GetHomeOutputDirectory(); message += this->GetHomeOutputDirectory();