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

Disable any STATUS output in --find-package mode 

Any STATUS output will be fed directly to the compiler, which
will not understand any status messages. Error messages
are fine, since they are errors and it is ok if the compiler
fails in such cases.

Alex
This commit is contained in:
Alex Neundorf 2011-08-16 00:40:59 +02:00
parent e552ae7cfd
commit ec6982dc8c
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Source/cmMakefile.cxx
View File

@ -3022,8 +3022,15 @@ cmCacheManager *cmMakefile::GetCacheManager() const
void cmMakefile::DisplayStatus(const char* message, float s) void cmMakefile::DisplayStatus(const char* message, float s)
{ {
this->GetLocalGenerator()->GetGlobalGenerator() cmake* cm = this->GetLocalGenerator()->GetGlobalGenerator()
->GetCMakeInstance()->UpdateProgress(message, s); ->GetCMakeInstance();
if (cm->GetWorkingMode() == cmake::FIND_PACKAGE_MODE)
{
// don't output any STATUS message in FIND_PACKAGE_MODE, since they will
// directly be fed to the compiler, which will be confused.
return;
}
cm->UpdateProgress(message, s);
} }
std::string cmMakefile::GetModulesFile(const char* filename) std::string cmMakefile::GetModulesFile(const char* filename)