[Cmake-commits] CMake branch, next, updated. v3.3.0-rc2-588-gd7aaa48

[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  d7aaa481c99eefdb4088ff1a6c3d39ba7ff54e2a (commit)
       via  d4682cd5aa51d282af7bcf1ffad050b9bd2321ba (commit)
       via  342b338618266360ddacc2eba3557f51478399ed (commit)
      from  58684af31446487f352a22120a8ce3de2cd935fe (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=d7aaa481c99eefdb4088ff1a6c3d39ba7ff54e2a
commit d7aaa481c99eefdb4088ff1a6c3d39ba7ff54e2a
Merge: 58684af d4682cd
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jun 22 10:50:07 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jun 22 10:50:07 2015 -0400

    Merge topic 'qt-autogen-always-run' into next
    
    d4682cd5 QtAutogen: Add comment explaining why rcc cannot use PRE_BUILD
    342b3386 Revert "QtAutogen: Use PRE_BUILD in Visual Studio generators even with rcc"


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d4682cd5aa51d282af7bcf1ffad050b9bd2321ba
commit d4682cd5aa51d282af7bcf1ffad050b9bd2321ba
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: Mon Jun 22 10:49:36 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
             }

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=342b338618266360ddacc2eba3557f51478399ed
commit 342b338618266360ddacc2eba3557f51478399ed
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jun 22 10:45:02 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jun 22 10:45:02 2015 -0400

    Revert "QtAutogen: Use PRE_BUILD in Visual Studio generators even with rcc"
    
    This reverts commit 12c3fcde52e8bdd5eed37e2f07a559ca72e5cd3d.

diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index 10339d1..d2f6e36 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -394,9 +394,14 @@ bool cmQtAutoGenerators::InitializeAutogenTarget(cmTarget* target)
     }
 #endif
 
-  // Ninja needs to know the rcc outputs are byproducts.
   std::vector<std::string> rcc_output;
-  if (makefile->GetGlobalGenerator()->GetName() == "Ninja")
+  bool const isNinja =
+    makefile->GetGlobalGenerator()->GetName() == "Ninja";
+  if(isNinja
+#if defined(_WIN32) && !defined(__CYGWIN__)
+        || usePRE_BUILD
+#endif
+        )
     {
     std::vector<cmSourceFile*> srcFiles;
     target->GetConfigCommonSourceFiles(srcFiles);
@@ -434,6 +439,9 @@ bool cmQtAutoGenerators::InitializeAutogenTarget(cmTarget* target)
               {
               this->ListQt4RccInputs(sf, depends);
               }
+#if defined(_WIN32) && !defined(__CYGWIN__)
+            usePRE_BUILD = false;
+#endif
             }
           }
         }

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

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


hooks/post-receive
-- 
CMake