diff options
| author | Brad King <brad.king@kitware.com> | 2016-11-10 13:34:22 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-11-10 13:34:22 (GMT) |
| commit | 25a76df17f72dcec494b88d2b59a54acbdee9798 (patch) | |
| tree | e8e35572853f33971ae4a6f2c583344cbc07def4 | |
| parent | 7c09bcfee81ab651e04505d29eb1c5e35fb673ce (diff) | |
| parent | e4232b82e6d285edf9038e2f352df61ab362b6fd (diff) | |
| download | CMake-25a76df17f72dcec494b88d2b59a54acbdee9798.zip CMake-25a76df17f72dcec494b88d2b59a54acbdee9798.tar.gz CMake-25a76df17f72dcec494b88d2b59a54acbdee9798.tar.bz2 | |
Merge topic 'autorcc-only-no-rebuild'
e4232b82 QtAutogen: Do not re-generate AUTORCC outputs on every build
| -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 499da3a..fa33cf2 100644 --- a/Source/cmQtAutoGenerators.cxx +++ b/Source/cmQtAutoGenerators.cxx @@ -456,8 +456,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; } |