[Cmake-commits] CMake branch, next, updated. v2.8.12.1-6316-g7df1ece

[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  7df1ece4aebe781ce51c59640876e5dc5c5a3fc0 (commit)
       via  870bd16f2c64dc8d74056a47bc7845e8d1b3b2f1 (commit)
      from  e758ea22200b5158c73fdb1a126581728129f159 (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=7df1ece4aebe781ce51c59640876e5dc5c5a3fc0
commit 7df1ece4aebe781ce51c59640876e5dc5c5a3fc0
Merge: e758ea2 870bd16
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Dec 20 11:40:14 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Dec 20 11:40:14 2013 -0500

    Merge topic 'fix-Qt-rcc-file-handling' into next
    
    870bd16 QtAutogen: Don't modify target source files while iterating them.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=870bd16f2c64dc8d74056a47bc7845e8d1b3b2f1
commit 870bd16f2c64dc8d74056a47bc7845e8d1b3b2f1
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Dec 20 17:37:20 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Dec 20 17:37:20 2013 +0100

    QtAutogen: Don't modify target source files while iterating them.
    
    Populate a separate vector of files and append them separately. This
    was the pattern used prior to commit 035b6908 (Autogen: Split AutoRcc
    handling into two methods, 2013-12-10), which was erroneously not
    maintained in that refactoring.

diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index a561aab..abf20cb 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -810,6 +810,8 @@ void cmQtAutoGenerators::InitializeAutoRccTarget(cmTarget* target)
 
   const std::vector<cmSourceFile*>& srcFiles = target->GetSourceFiles();
 
+  std::vector<cmSourceFile*> newFiles;
+
   for(std::vector<cmSourceFile*>::const_iterator fileIt = srcFiles.begin();
       fileIt != srcFiles.end();
       ++fileIt)
@@ -833,10 +835,17 @@ void cmQtAutoGenerators::InitializeAutoRccTarget(cmTarget* target)
                                 rcc_output_file.c_str(), false);
         cmSourceFile* rccCppSource
                 = makefile->GetOrCreateSource(rcc_output_file.c_str(), true);
-        target->AddSourceFile(rccCppSource);
+        newFiles.push_back(rccCppSource);
         }
       }
     }
+
+  for(std::vector<cmSourceFile*>::const_iterator fileIt = newFiles.begin();
+      fileIt != newFiles.end();
+      ++fileIt)
+    {
+    target->AddSourceFile(*fileIt);
+    }
 }
 
 void cmQtAutoGenerators::SetupAutoRccTarget(cmTarget const* target)

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

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


hooks/post-receive
-- 
CMake