diff options
| author | Alex Neundorf <neundorf@kde.org> | 2011-08-15 22:40:59 (GMT) |
|---|---|---|
| committer | Alex Neundorf <neundorf@kde.org> | 2011-08-15 22:40:59 (GMT) |
| commit | ec6982dc8cad04c72a6ab78b7f115ece65e812bd (patch) | |
| tree | 73fb8892cfd2d7bcbfd64cf821710af2a24b52d7 /Source | |
| parent | e552ae7cfd8d6b3dce51f61258ce4854db7c7fbc (diff) | |
| download | CMake-ec6982dc8cad04c72a6ab78b7f115ece65e812bd.zip CMake-ec6982dc8cad04c72a6ab78b7f115ece65e812bd.tar.gz CMake-ec6982dc8cad04c72a6ab78b7f115ece65e812bd.tar.bz2 | |
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
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmMakefile.cxx | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 3329a2c..b94db48 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -3022,8 +3022,15 @@ cmCacheManager *cmMakefile::GetCacheManager() const void cmMakefile::DisplayStatus(const char* message, float s) { - this->GetLocalGenerator()->GetGlobalGenerator() - ->GetCMakeInstance()->UpdateProgress(message, s); + cmake* cm = this->GetLocalGenerator()->GetGlobalGenerator() + ->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) |