[Cmake-commits] CMake branch, next, updated. v3.4.0-rc2-826-g7b38cda

[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  7b38cda3bc92ab002b19020a1c201552d039a6fc (commit)
       via  acf26f03f1cdf55686dc50cddfc4aa6fd68cfae7 (commit)
       via  9c9072439af6d8f16ec407789e8a1223dd7c7564 (commit)
      from  c3d33f3b0d9341d1a5927382ff58e6ba4baa330f (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=7b38cda3bc92ab002b19020a1c201552d039a6fc
commit 7b38cda3bc92ab002b19020a1c201552d039a6fc
Merge: c3d33f3 acf26f0
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 21 17:17:45 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 21 17:17:45 2015 -0400

    Merge topic 'use-generator-target' into next
    
    acf26f03 fixup! Port to GetGeneratorTargets.
    9c907243 fixup! cmLocalGenerator: Store a vector of generator targets.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=acf26f03f1cdf55686dc50cddfc4aa6fd68cfae7
commit acf26f03f1cdf55686dc50cddfc4aa6fd68cfae7
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 21 23:17:22 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 21 23:17:22 2015 +0200

    fixup! Port to GetGeneratorTargets.

diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index 0f39ddb..4895698 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -129,7 +129,7 @@ void cmLocalVisualStudio7Generator::FixGlobalTargets()
   for(std::vector<cmGeneratorTarget*>::iterator l = tgts.begin();
       l != tgts.end(); l++)
     {
-    cmTarget& tgt = (*l)->Target;
+    cmTarget& tgt = *(*l)->Target;
     if(tgt.GetType() == cmState::GLOBAL_TARGET)
       {
       std::vector<std::string> no_depends;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9c9072439af6d8f16ec407789e8a1223dd7c7564
commit 9c9072439af6d8f16ec407789e8a1223dd7c7564
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 21 23:16:06 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 21 23:16:06 2015 +0200

    fixup! cmLocalGenerator: Store a vector of generator targets.

diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx
index 8ab2262..4d431f6 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -87,7 +87,7 @@ void cmGlobalVisualStudioGenerator::AddExtraIDETargets()
                           "Build all projects");
 
       cmGeneratorTarget* gt = new cmGeneratorTarget(allBuild, gen[0]);
-      gen[0]->AddGeneratorTarget(allBuild, gt);
+      gen[0]->AddGeneratorTarget(gt);
       this->AddGeneratorTarget(allBuild, gt);
 
 #if 0

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

Summary of changes:
 Source/cmGlobalVisualStudioGenerator.cxx |    2 +-
 Source/cmLocalVisualStudio7Generator.cxx |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake