[Cmake-commits] CMake branch, next, updated. v3.7.0-rc3-1004-gdb87aa3

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  db87aa33be07ed5234f948316a1483f716e3ecb7 (commit)
       via  e4232b82e6d285edf9038e2f352df61ab362b6fd (commit)
      from  7d34c8eb67d557a6eefe1ca7980ff00906bd0f9f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=db87aa33be07ed5234f948316a1483f716e3ecb7
commit db87aa33be07ed5234f948316a1483f716e3ecb7
Merge: 7d34c8e e4232b8
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Nov 9 11:26:22 2016 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Nov 9 11:26:22 2016 -0500

    Merge topic 'autorcc-only-no-rebuild' into next
    
    e4232b82 QtAutogen: Do not re-generate AUTORCC outputs on every build


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e4232b82e6d285edf9038e2f352df61ab362b6fd
commit e4232b82e6d285edf9038e2f352df61ab362b6fd
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Nov 9 11:05:45 2016 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Nov 9 11:22:07 2016 -0500

    QtAutogen: Do not re-generate AUTORCC outputs on every build
    
    Refactoring in commit v3.6.0-rc1~134^2~10 (Autogen: Split out moc file
    generation code to dedicated method, 2016-04-18) removed the
    unconditional creation of the `<target>_automoc.cpp` file.  Now it is
    generated only when `AUTOMOC` is enabled.  However, if this file is not
    created then our internal `GenerateAll` setting is enabled on every
    build, causing `AUTORCC` to re-generate its file(s) every time.  Fix the
    `GenerateAll` setting to be used only for when autogen settings change.
    The old logic was left from when we had only automoc.
    
    Closes: #16413

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;
   }
 

-----------------------------------------------------------------------

Summary of changes:
 Source/cmQtAutoGenerators.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake