[Cmake-commits] CMake branch, next, updated. v3.3.0-rc1-307-g0efeb96

[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  0efeb967c31ca2ab2fb38ffde27f20349517c423 (commit)
       via  142f26c3b782fd558d4d0d11756516b2380b67be (commit)
      from  84533831fddbb42fb04ee9b193ea6ac3c67ec064 (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=0efeb967c31ca2ab2fb38ffde27f20349517c423
commit 0efeb967c31ca2ab2fb38ffde27f20349517c423
Merge: 8453383 142f26c
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Jun 8 18:38:54 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jun 8 18:38:54 2015 -0400

    Merge topic 'use-generator-target' into next
    
    142f26c3 Compile fix.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=142f26c3b782fd558d4d0d11756516b2380b67be
commit 142f26c3b782fd558d4d0d11756516b2380b67be
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Jun 9 00:38:41 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Jun 9 00:38:41 2015 +0200

    Compile fix.

diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx
index ee4d21c..bdf2b8d 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -847,7 +847,7 @@ cmGlobalVisualStudioGenerator::TargetIsFortranOnly(cmTarget const& target)
 //----------------------------------------------------------------------------
 bool
 cmGlobalVisualStudioGenerator::TargetCompare
-::operator()(cmTarget const* l, cmTarget const* r) const
+::operator()(cmGeneratorTarget const* l, cmGeneratorTarget const* r) const
 {
   // Make sure ALL_BUILD is first so it is the default active project.
   if(r->GetName() == "ALL_BUILD")
diff --git a/Source/cmGlobalVisualStudioGenerator.h b/Source/cmGlobalVisualStudioGenerator.h
index 69b4564..41843b3 100644
--- a/Source/cmGlobalVisualStudioGenerator.h
+++ b/Source/cmGlobalVisualStudioGenerator.h
@@ -91,7 +91,8 @@ public:
   class TargetSet: public std::set<cmTarget const*> {};
   struct TargetCompare
   {
-    bool operator()(cmTarget const* l, cmTarget const* r) const;
+    bool operator()(cmGeneratorTarget const* l,
+                    cmGeneratorTarget const* r) const;
   };
   class OrderedTargetDependSet;
 

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

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


hooks/post-receive
-- 
CMake