[Cmake-commits] CMake branch, next, updated. v3.3.0-rc2-620-g9ad5d3a

[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  9ad5d3a866edf06012af697a8949c6369010a44a (commit)
       via  2bf22a4b908592e363fc9aa93b3d09fbb5387b4d (commit)
      from  ac05313642c35cb3cee047d897614896bd7ce063 (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=9ad5d3a866edf06012af697a8949c6369010a44a
commit 9ad5d3a866edf06012af697a8949c6369010a44a
Merge: ac05313 2bf22a4
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jun 23 09:06:01 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jun 23 09:06:01 2015 -0400

    Merge topic 'qt-autogen-always-run' into next
    
    2bf22a4b QtAutogen: Add comment explaining why rcc cannot use PRE_BUILD


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2bf22a4b908592e363fc9aa93b3d09fbb5387b4d
commit 2bf22a4b908592e363fc9aa93b3d09fbb5387b4d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jun 22 10:49:36 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jun 23 09:05:30 2015 -0400

    QtAutogen: Add comment explaining why rcc cannot use PRE_BUILD

diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index d2f6e36..d8f826c 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -440,6 +440,9 @@ bool cmQtAutoGenerators::InitializeAutogenTarget(cmTarget* target)
               this->ListQt4RccInputs(sf, depends);
               }
 #if defined(_WIN32) && !defined(__CYGWIN__)
+            // Cannot use PRE_BUILD because the resource files themselves
+            // may not be sources within the target so VS may not know the
+            // target needs to re-build at all.
             usePRE_BUILD = false;
 #endif
             }

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

Summary of changes:


hooks/post-receive
-- 
CMake