[Cmake-commits] CMake branch, next, updated. v3.4.0-rc2-1053-gc711536

[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  c71153606ef52a10fe8d1867f169bf28a8baf9fb (commit)
       via  83ac11ddee0b40999bd94d52c4fffd09ab268a43 (commit)
       via  ce3a4cde0cd851d3a1cd01b10f4c0cc39e5b5742 (commit)
      from  4f9e8feff6fdfe494c2593f9a134b9bdf95482c6 (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=c71153606ef52a10fe8d1867f169bf28a8baf9fb
commit c71153606ef52a10fe8d1867f169bf28a8baf9fb
Merge: 4f9e8fe 83ac11d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Oct 26 18:46:56 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 26 18:46:56 2015 -0400

    Merge topic 'use-generator-target' into next
    
    83ac11dd fixup! cmTarget: Make compatbility API explicit.
    ce3a4cde fixup! cmGlobalGenerator: Remove map from cmTarget to cmGeneratorTarget


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=83ac11ddee0b40999bd94d52c4fffd09ab268a43
commit 83ac11ddee0b40999bd94d52c4fffd09ab268a43
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Oct 26 23:46:11 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 26 23:46:11 2015 +0100

    fixup! cmTarget: Make compatbility API explicit.

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index fc23760..35c6084 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -733,7 +733,7 @@ void cmMakefile::ConfigureFinalPass()
     }
 #if defined(_WIN32) && !defined(__CYGWIN__)
   // Do old-style link dependency analysis only for CM_USE_OLD_VS6.
-  if(this->Makefile->GetGlobalGenerator()->IsForVS6())
+  if(this->GetGlobalGenerator()->IsForVS6())
     {
     for (cmTargets::iterator l = this->Targets.begin();
          l != this->Targets.end(); l++)
@@ -747,7 +747,7 @@ void cmMakefile::ConfigureFinalPass()
       // system generation uses up-to-date information even if other cache
       // invalidation code in this source file is buggy.
 
-      l->second->AnalyzeLibDependenciesForVS6(this);
+      l->second.AnalyzeLibDependenciesForVS6(this);
       }
     }
 #endif

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ce3a4cde0cd851d3a1cd01b10f4c0cc39e5b5742
commit ce3a4cde0cd851d3a1cd01b10f4c0cc39e5b5742
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Oct 26 23:44:17 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Oct 26 23:44:17 2015 +0100

    fixup! cmGlobalGenerator: Remove map from cmTarget to cmGeneratorTarget

diff --git a/Source/cmGlobalVisualStudio8Generator.cxx b/Source/cmGlobalVisualStudio8Generator.cxx
index 9f36b54..b7478f9 100644
--- a/Source/cmGlobalVisualStudio8Generator.cxx
+++ b/Source/cmGlobalVisualStudio8Generator.cxx
@@ -353,16 +353,17 @@ void cmGlobalVisualStudio8Generator::AddExtraIDETargets()
   cmGlobalVisualStudio7Generator::AddExtraIDETargets();
   if(this->AddCheckTarget())
     {
-    for (unsigned int i = 0; i < this->Makefiles.size(); ++i)
+    for (unsigned int i = 0; i < this->LocalGenerators.size(); ++i)
       {
-      cmTargets& tgts = this->Makefiles[i]->GetTargets();
+      std::vector<cmGeneratorTarget*> tgts =
+          this->LocalGenerators[i]->GetGeneratorTargets();
       // All targets depend on the build-system check target.
-      for(cmTargets::iterator ti = tgts.begin();
+      for(std::vector<cmGeneratorTarget*>::iterator ti = tgts.begin();
           ti != tgts.end(); ++ti)
         {
-        if(ti->first != CMAKE_CHECK_BUILD_SYSTEM_TARGET)
+        if((*ti)->GetName() != CMAKE_CHECK_BUILD_SYSTEM_TARGET)
           {
-          ti->second->AddUtility(CMAKE_CHECK_BUILD_SYSTEM_TARGET);
+          (*ti)->AddUtility(CMAKE_CHECK_BUILD_SYSTEM_TARGET);
           }
         }
       }

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

Summary of changes:
 Source/cmGlobalVisualStudio8Generator.cxx |   11 ++++++-----
 Source/cmMakefile.cxx                     |    4 ++--
 2 files changed, 8 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
CMake