[Cmake-commits] CMake branch, next, updated. v3.3.2-3309-g1af2a19

[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  1af2a1923d16ba8692ba83cd1e1c86bfdc890531 (commit)
       via  0f78b9e05eafc6621cdbdc8ea77119d778d78ebf (commit)
       via  6cbc793fdd1b97803b0b96809732f53ab1adf79d (commit)
      from  dddedd4a3b7c78c73e595be06f505dbda4b08980 (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=1af2a1923d16ba8692ba83cd1e1c86bfdc890531
commit 1af2a1923d16ba8692ba83cd1e1c86bfdc890531
Merge: dddedd4 0f78b9e
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Sep 26 13:44:37 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Sep 26 13:44:37 2015 -0400

    Merge topic 'simplify-qt-autogen' into next
    
    0f78b9e0 QtAutogen: Port away from cmLocalGenerator.
    6cbc793f fixup! QtAutogen: Split initializer class into separate file.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0f78b9e05eafc6621cdbdc8ea77119d778d78ebf
commit 0f78b9e05eafc6621cdbdc8ea77119d778d78ebf
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Sep 26 19:41:31 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Sep 26 19:44:06 2015 +0200

    QtAutogen: Port away from cmLocalGenerator.

diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index f56664d..e54e581 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -12,7 +12,7 @@
 ============================================================================*/
 
 #include "cmGlobalGenerator.h"
-#include "cmLocalGenerator.h"
+#include "cmOutputConverter.h"
 #include "cmMakefile.h"
 #include "cmSystemTools.h"
 #include "cmState.h"
@@ -180,19 +180,18 @@ bool cmQtAutoGenerators::Run(const std::string& targetDirectory,
 
   cmState::Snapshot snapshot = cm.GetCurrentSnapshot();
   cmsys::auto_ptr<cmMakefile> mf(new cmMakefile(&gg, snapshot));
-  cmsys::auto_ptr<cmLocalGenerator> lg(gg.CreateLocalGenerator(mf.get()));
-  lg->GetMakefile()->SetCurrentBinaryDirectory(targetDirectory);
-  lg->GetMakefile()->SetCurrentSourceDirectory(targetDirectory);
-  gg.SetCurrentMakefile(lg->GetMakefile());
+  mf->SetCurrentBinaryDirectory(targetDirectory);
+  mf->SetCurrentSourceDirectory(targetDirectory);
+  gg.SetCurrentMakefile(mf.get());
 
-  this->ReadAutogenInfoFile(lg->GetMakefile(), targetDirectory, config);
-  this->ReadOldMocDefinitionsFile(lg->GetMakefile(), targetDirectory);
+  this->ReadAutogenInfoFile(mf.get(), targetDirectory, config);
+  this->ReadOldMocDefinitionsFile(mf.get(), targetDirectory);
 
   this->Init();
 
   if (this->QtMajorVersion == "4" || this->QtMajorVersion == "5")
     {
-    success = this->RunAutogen(lg->GetMakefile());
+    success = this->RunAutogen(mf.get());
     }
 
   this->WriteOldMocDefinitionsFile(targetDirectory);

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6cbc793fdd1b97803b0b96809732f53ab1adf79d
commit 6cbc793fdd1b97803b0b96809732f53ab1adf79d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Sep 26 19:40:45 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Sep 26 19:44:01 2015 +0200

    fixup! QtAutogen: Split initializer class into separate file.

diff --git a/Source/cmQtAutoGeneratorInitializer.cxx b/Source/cmQtAutoGeneratorInitializer.cxx
index 21a1a2c..24e7ed8 100644
--- a/Source/cmQtAutoGeneratorInitializer.cxx
+++ b/Source/cmQtAutoGeneratorInitializer.cxx
@@ -21,6 +21,10 @@
 
 #include <cmsys/FStream.hxx>
 
+#if defined(_WIN32) && !defined(__CYGWIN__)
+# include "cmGlobalVisualStudioGenerator.h"
+#endif
+
 std::string cmQtAutoGeneratorInitializer::GetAutogenTargetName(
     cmTarget const* target)
 {
diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index 42bcaa5..f56664d 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -14,15 +14,10 @@
 #include "cmGlobalGenerator.h"
 #include "cmLocalGenerator.h"
 #include "cmMakefile.h"
-#include "cmSourceFile.h"
 #include "cmSystemTools.h"
 #include "cmState.h"
 #include "cmAlgorithms.h"
 
-#if defined(_WIN32) && !defined(__CYGWIN__)
-# include "cmGlobalVisualStudioGenerator.h"
-#endif
-
 #include <sys/stat.h>
 
 #include <cmsys/Terminal.h>
diff --git a/Source/cmQtAutoGenerators.h b/Source/cmQtAutoGenerators.h
index 346c468..ab7b6ed 100644
--- a/Source/cmQtAutoGenerators.h
+++ b/Source/cmQtAutoGenerators.h
@@ -19,11 +19,7 @@
 #include <string>
 #include <map>
 
-class cmGlobalGenerator;
 class cmMakefile;
-class cmLocalGenerator;
-class cmTarget;
-class cmSourceFile;
 
 class cmQtAutoGenerators
 {

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

Summary of changes:
 Source/cmQtAutoGeneratorInitializer.cxx |    4 ++++
 Source/cmQtAutoGenerators.cxx           |   20 +++++++-------------
 Source/cmQtAutoGenerators.h             |    4 ----
 3 files changed, 11 insertions(+), 17 deletions(-)


hooks/post-receive
-- 
CMake