BUG: Sweeping changes to cleanup computation of target names. This should

fix many bugs related to target names being computed inconsistently.

- Centralized computation of a target's file name to a method in
  cmTarget.  Now that global knowledge is always available the
  *_CMAKE_PATH cache variables are no longer needed.

- Centralized computation of link library command lines and link
  directory search order.

- Moved computation of link directories needed to link CMake targets
  to be after evaluation of linking dependencies.

This also removed alot of duplicate code in which each version had its
own bugs.

This commit is surrounded by the tags

  CMake-TargetNameCentralization1-pre

and

  CMake-TargetNameCentralization1-post

so make the large set of changes easy to identify.

1 files changed, 4 insertions, 7 deletions

diff --git a/Source/cmGlobalVisualStudio7Generator.cxx b/Source/cmGlobalVisualStudio7Generator.cxx
index e2d8d6b..a5d5735 100644
--- a/Source/cmGlobalVisualStudio7Generator.cxx
+++ b/Source/cmGlobalVisualStudio7Generator.cxx
@@ -238,6 +238,7 @@ void cmGlobalVisualStudio7Generator::OutputSLNFile(cmLocalGenerator* root,
     {
     return;
     }
+  m_CurrentProject = root->GetMakefile()->GetProjectName();
   std::string fname = root->GetMakefile()->GetStartOutputDirectory();
   fname += "/";
   fname += root->GetMakefile()->GetProjectName();
@@ -547,10 +548,7 @@ cmGlobalVisualStudio7Generator
       if(j->first != dspname)
         {
         // is the library part of this SLN ? If so add dependency
-        std::string libPath = j->first + "_CMAKE_PATH";
-        const char* cacheValue
-          = m_CMakeInstance->GetCacheDefinition(libPath.c_str());
-        if(cacheValue && *cacheValue)
+        if(this->FindTarget(m_CurrentProject.c_str(), j->first.c_str()))
           {
           std::string guid = this->GetGUID(j->first.c_str());
           if(guid.size() == 0)
@@ -561,9 +559,8 @@ cmGlobalVisualStudio7Generator
             m += j->first.c_str();
             cmSystemTools::Error(m.c_str());
             }
-          
-          fout << "\t\t{" << this->GetGUID(dspname) << "}." << depcount << " = {"
-               << guid << "}\n";
+          fout << "\t\t{" << this->GetGUID(dspname) << "}."
+               << depcount << " = {" << guid << "}\n";
           depcount++;
           }
         }