[Cmake-commits] CMake branch, next, updated. v2.8.3-610-gfc13fef

[Brad King]

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  fc13fef3ab99fef90a16a3d7fdc8ced9c0ac61d2 (commit)
       via  1a0c166a266cade3bf07cc4d205dedfe2d570bd0 (commit)
      from  b129f0cb5672cb4bbb226397b81d17ec2e09bbb2 (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=fc13fef3ab99fef90a16a3d7fdc8ced9c0ac61d2
commit fc13fef3ab99fef90a16a3d7fdc8ced9c0ac61d2
Merge: b129f0c 1a0c166
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Nov 12 12:40:36 2010 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Nov 12 12:40:36 2010 -0500

    Merge topic 'vs8-direct-depends' into next
    
    1a0c166 Store direct dependencies in solutions for VS >= 8


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1a0c166a266cade3bf07cc4d205dedfe2d570bd0
commit 1a0c166a266cade3bf07cc4d205dedfe2d570bd0
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Aug 20 14:07:02 2010 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Sep 10 09:12:03 2010 -0400

    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.

diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index c6d05b0..820d225 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 c5c9d5c..48f9003 100644
--- a/Source/cmGlobalVisualStudio8Generator.cxx
+++ b/Source/cmGlobalVisualStudio8Generator.cxx
@@ -289,6 +289,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 e0d5d80..95b6a17 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;
 };

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

Summary of changes:
 Source/cmGlobalGenerator.cxx              |    5 ++---
 Source/cmGlobalVisualStudio8Generator.cxx |   14 ++++++++++++++
 Source/cmGlobalVisualStudio8Generator.h   |    2 ++
 3 files changed, 18 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake