[Cmake-commits] CMake branch, next, updated. v3.2.2-2845-g5ac2dab

[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  5ac2dab71def9ef70220c44cbea3654287fe83a8 (commit)
       via  88660e965fe31e4083893fedaac3ddf5d4cf305f (commit)
       via  43b7b6d884d0ff2b6c62c607fbb4d843eaa0eb6b (commit)
      from  69ef42c50a317ce1afdfbc51faa8f1ab8e6f3d0f (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=5ac2dab71def9ef70220c44cbea3654287fe83a8
commit 5ac2dab71def9ef70220c44cbea3654287fe83a8
Merge: 69ef42c 88660e9
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun May 17 07:33:54 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun May 17 07:33:54 2015 -0400

    Merge topic 'clean-up-vs-generators' into next
    
    88660e96 fixup! VS: Move version information to global generator.
    43b7b6d8 fixup! VS: Simplify setting of flag table.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=88660e965fe31e4083893fedaac3ddf5d4cf305f
commit 88660e965fe31e4083893fedaac3ddf5d4cf305f
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun May 17 13:33:26 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sun May 17 13:33:26 2015 +0200

    fixup! VS: Move version information to global generator.

diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index 9a2fadb..c446659 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -378,7 +378,7 @@ bool cmQtAutoGenerators::InitializeAutogenTarget(cmTarget* target)
     // reduce the number of targets loaded into the IDE.
     // This also works around a VS 11 bug that may skip updating the target:
     //  https://connect.microsoft.com/VisualStudio/feedback/details/769495
-    usePRE_BUILD = gg->GetVersion() >= cmGlobalVisualStudioGenerator::VS7;
+    usePRE_BUILD = vsgg->GetVersion() >= cmGlobalVisualStudioGenerator::VS7;
     if(usePRE_BUILD)
       {
       for (std::vector<std::string>::iterator it = depends.begin();

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=43b7b6d884d0ff2b6c62c607fbb4d843eaa0eb6b
commit 43b7b6d884d0ff2b6c62c607fbb4d843eaa0eb6b
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun May 17 13:33:08 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sun May 17 13:33:08 2015 +0200

    fixup! VS: Simplify setting of flag table.

diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index 353c04a..d11769f 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -769,8 +769,6 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
     t = Options::FortranCompiler;
     table = cmLocalVisualStudio7GeneratorFortranFlagTable;
     }
-  cmGlobalVisualStudio7Generator* gg =
-    static_cast<cmGlobalVisualStudio7Generator*>(this->GlobalGenerator);
   Options targetOptions(this, t,
                         table,
                         gg->ExtraFlagTable);

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

Summary of changes:
 Source/cmLocalVisualStudio7Generator.cxx |    2 --
 Source/cmQtAutoGenerators.cxx            |    2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)


hooks/post-receive
-- 
CMake