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, 37 insertions, 0 deletions

diff --git a/Source/cmComputeLinkDepends.cxx b/Source/cmComputeLinkDepends.cxx
index 5005e96..e232525 100644
--- a/Source/cmComputeLinkDepends.cxx
+++ b/Source/cmComputeLinkDepends.cxx
@@ -169,6 +169,9 @@ cmComputeLinkDepends
 
   // Enable debug mode if requested.
   this->DebugMode = this->Makefile->IsOn("CMAKE_LINK_DEPENDS_DEBUG_MODE");
+
+  // Assume no compatibility until set.
+  this->OldLinkDirMode = false;
 }
 
 //----------------------------------------------------------------------------
@@ -183,6 +186,12 @@ cmComputeLinkDepends::~cmComputeLinkDepends()
 }
 
 //----------------------------------------------------------------------------
+void cmComputeLinkDepends::SetOldLinkDirMode(bool b)
+{
+  this->OldLinkDirMode = b;
+}
+
+//----------------------------------------------------------------------------
 std::vector<cmComputeLinkDepends::LinkEntry> const&
 cmComputeLinkDepends::Compute()
 {
@@ -460,6 +469,10 @@ void cmComputeLinkDepends::AddVarLinkEntries(int depender_index,
         {
         actual_libs.push_back(*di);
         }
+      else if(this->OldLinkDirMode)
+        {
+        this->CheckWrongConfigItem(*di);
+        }
 
       // Reset the link type until another explicit type is given.
       llt = cmTarget::GENERAL;
@@ -492,6 +505,10 @@ cmComputeLinkDepends::AddTargetLinkEntries(int depender_index,
       {
       actual_libs.push_back(li->first);
       }
+    else if(this->OldLinkDirMode)
+      {
+      this->CheckWrongConfigItem(li->first);
+      }
     }
 
   // Add these entries.
@@ -809,3 +826,23 @@ void cmComputeLinkDepends::DisplayFinalEntries()
     }
   fprintf(stderr, "\n");
 }
+
+//----------------------------------------------------------------------------
+void cmComputeLinkDepends::CheckWrongConfigItem(std::string const& item)
+{
+  if(!this->OldLinkDirMode)
+    {
+    return;
+    }
+
+  // For CMake 2.4 bug-compatibility we need to consider the output
+  // directories of targets linked in another configuration as link
+  // directories.
+  if(cmTarget* tgt = this->Makefile->FindTargetToUse(item.c_str()))
+    {
+    if(!tgt->IsImported())
+      {
+      this->OldWrongConfigItems.insert(tgt);
+      }
+    }
+}