Merge branch 'autorcc-only-no-rebuild' into release

dc083f95 · Brad King · 51112aaa · e4232b82 · dc083f95
Commit dc083f95 authored Nov 09, 2016 by Brad King
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

Source/cmQtAutoGenerators.cxx Source/cmQtAutoGenerators.cxx +2 -2

No files found.
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -455,8 +455,8 @@ static std::string ReadAll(const std::string& filename)

 bool cmQtAutoGenerators::RunAutogen(cmMakefile* makefile)
 {
-  if (!cmsys::SystemTools::FileExists(this->OutMocCppFilenameAbs.c_str()) ||
-      (this->OldCompileSettingsStr != this->CurrentCompileSettingsStr)) {
+  // If settings changed everything needs to be re-generated.
+  if (this->OldCompileSettingsStr != this->CurrentCompileSettingsStr) {
    this->GenerateAll = true;
  }