From 1a0c166a266cade3bf07cc4d205dedfe2d570bd0 Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Fri, 20 Aug 2010 14:07:02 -0400
Subject: [PATCH] Store direct dependencies in solutions for VS >= 8

Since commit bc43b0f2 (Do not link library dependencies in VS solutions,
2009-10-20) CMake disables for VS >= 8 linking of a target to libraries
that happen to be listed as solution-level dependencies.  Therefore we
can list the direct dependencies of each target in the solution file and
let VS handle transitive dependencies automatically.
---
 Source/cmGlobalGenerator.cxx              |  5 ++---
 Source/cmGlobalVisualStudio8Generator.cxx | 14 ++++++++++++++
 Source/cmGlobalVisualStudio8Generator.h   |  2 ++
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index c6d05b06a..820d22535 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -699,9 +699,8 @@ bool cmGlobalGenerator::IsDependedOn(const char* project,
          l != targets.end(); l++)
       {
       cmTarget& target = l->second;
-      std::set<cmStdString>::const_iterator pos =
-        target.GetUtilities().find(targetIn->GetName());
-      if(pos != target.GetUtilities().end())
+      TargetDependSet const& tgtdeps = this->GetTargetDirectDepends(target);
+      if(tgtdeps.count(targetIn))
         {
         return true;
         }
diff --git a/Source/cmGlobalVisualStudio8Generator.cxx b/Source/cmGlobalVisualStudio8Generator.cxx
index c5c9d5c1b..48f900344 100644
--- a/Source/cmGlobalVisualStudio8Generator.cxx
+++ b/Source/cmGlobalVisualStudio8Generator.cxx
@@ -288,6 +288,20 @@ cmGlobalVisualStudio8Generator
     }
 }
 
+//----------------------------------------------------------------------------
+void cmGlobalVisualStudio8Generator::WriteProjectDepends(
+  std::ostream& fout, const char*, const char*, cmTarget& t)
+{
+  TargetDependSet const& unordered = this->GetTargetDirectDepends(t);
+  OrderedTargetDependSet depends(unordered);
+  for(OrderedTargetDependSet::const_iterator i = depends.begin();
+      i != depends.end(); ++i)
+    {
+    std::string guid = this->GetGUID((*i)->GetName());
+    fout << "\t\t{" << guid << "} = {" << guid << "}\n";
+    }
+}
+
 //----------------------------------------------------------------------------
 bool cmGlobalVisualStudio8Generator::NeedLinkLibraryDependencies(
   cmTarget& target)
diff --git a/Source/cmGlobalVisualStudio8Generator.h b/Source/cmGlobalVisualStudio8Generator.h
index e0d5d8044..95b6a17c9 100644
--- a/Source/cmGlobalVisualStudio8Generator.h
+++ b/Source/cmGlobalVisualStudio8Generator.h
@@ -78,6 +78,8 @@ protected:
   virtual void WriteProjectConfigurations(std::ostream& fout,
                                           const char* name,
                                           bool partOfDefaultBuild);
+  virtual void WriteProjectDepends(std::ostream& fout, const char* name,
+                                   const char* path, cmTarget &t);
 
   const char* ArchitectureId;
 };