BUG: Fix bug 6605 more completely

  - CMake 2.4 added link directories for targets linked
    in the optimized configuration even when building debug
  - Old behavior for policy CMP0003 must account for this

1 files changed, 20 insertions, 0 deletions

diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx
index 82db1d3..fc9bf47 100644
--- a/Source/cmComputeLinkInformation.cxx
+++ b/Source/cmComputeLinkInformation.cxx
@@ -510,6 +510,7 @@ bool cmComputeLinkInformation::Compute()
 
   // Compute the ordered link line items.
   cmComputeLinkDepends cld(this->Target, this->Config);
+  cld.SetOldLinkDirMode(this->OldLinkDirMode);
   cmComputeLinkDepends::EntryVector const& linkEntries = cld.Compute();
 
   // Add the link line items.
@@ -539,6 +540,25 @@ bool cmComputeLinkInformation::Compute()
     this->SetCurrentLinkType(this->StartLinkType);
     }
 
+  // Finish listing compatibility paths.
+  if(this->OldLinkDirMode)
+    {
+    // For CMake 2.4 bug-compatibility we need to consider the output
+    // directories of targets linked in another configuration as link
+    // directories.
+    std::set<cmTarget*> const& wrongItems = cld.GetOldWrongConfigItems();
+    for(std::set<cmTarget*>::const_iterator i = wrongItems.begin();
+        i != wrongItems.end(); ++i)
+      {
+      cmTarget* tgt = *i;
+      bool implib =
+        (this->UseImportLibrary &&
+         (tgt->GetType() == cmTarget::SHARED_LIBRARY));
+      std::string lib = tgt->GetFullPath(this->Config , implib, true);
+      this->OldLinkDirItems.push_back(lib);
+      }
+    }
+
   // Finish setting up linker search directories.
   if(!this->FinishLinkerSearchDirectories())
     {