[Cmake-commits] CMake branch, next, updated. v3.0.2-5482-gde90c63

[Stephen Kelly]

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  de90c635bedfcf0ff316330c1062c3b9781a3d46 (commit)
       via  906a078cd6b7d97b6e563351776dbc464f2a852c (commit)
      from  44adbd2e2f25af0f7fbc3a49dfc6d8ccd9dae724 (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=de90c635bedfcf0ff316330c1062c3b9781a3d46
commit de90c635bedfcf0ff316330c1062c3b9781a3d46
Merge: 44adbd2 906a078
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Sep 28 08:44:26 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Sep 28 08:44:26 2014 -0400

    Merge topic 'autorcc-depends' into next
    
    906a078c Explicitly exclude generated files for dependency tracking.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=906a078cd6b7d97b6e563351776dbc464f2a852c
commit 906a078cd6b7d97b6e563351776dbc464f2a852c
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Sep 28 14:42:56 2014 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Sep 28 14:42:56 2014 +0200

    Explicitly exclude generated files for dependency tracking.

diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index 8f1a52f..8054527 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -355,17 +355,20 @@ bool cmQtAutoGenerators::InitializeAutogenTarget(cmTarget* target)
         {
 
         std::string entriesList;
-        if (qtMajorVersion == "5")
+        if (!cmSystemTools::IsOn(sf->GetPropertyForUser("GENERATED")))
           {
-          entriesList = this->ListQt5RccInputs(sf, target, depends);
-          }
-        else
-          {
-          entriesList = this->ListQt4RccInputs(sf, depends);
-          }
-        if (entriesList.empty())
-          {
-          return false;
+          if (qtMajorVersion == "5")
+            {
+            entriesList = this->ListQt5RccInputs(sf, target, depends);
+            }
+          else
+            {
+            entriesList = this->ListQt4RccInputs(sf, depends);
+            }
+          if (entriesList.empty())
+            {
+            return false;
+            }
           }
 
         qrcInputs += qrcInputsSep;

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

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


hooks/post-receive
-- 
CMake