diff options
| author | Brad King <brad.king@kitware.com> | 2016-11-09 16:26:04 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-11-09 16:26:04 (GMT) |
| commit | dc083f953466ceb05ea970eed38091bc1030b64e (patch) | |
| tree | b82cef6f3275e0344174dc9428a82f01f22b52a6 | |
| parent | 51112aaa18d841ce161863e2831dc478d0cf8272 (diff) | |
| parent | e4232b82e6d285edf9038e2f352df61ab362b6fd (diff) | |
| download | CMake-dc083f953466ceb05ea970eed38091bc1030b64e.zip CMake-dc083f953466ceb05ea970eed38091bc1030b64e.tar.gz CMake-dc083f953466ceb05ea970eed38091bc1030b64e.tar.bz2 | |
Merge branch 'autorcc-only-no-rebuild' into release
| -rw-r--r-- | Source/cmQtAutoGenerators.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx index b66257c..84d00ea 100644 --- 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; } |