From 28526006484459d3f47ac8c3e0ea03cf8f1d4d2f Mon Sep 17 00:00:00 2001
From: Bill Hoffman <bill.hoffman@kitware.com>
Date: Mon, 20 Nov 2006 13:57:12 -0500
Subject: [PATCH] ENH: fix for when a library is tagged both debug and
 optimized

---
 Source/cmMakefile.cxx | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index fc6114ed3..54a778f6e 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -954,11 +954,16 @@ void cmMakefile::AddLinkLibraryForTarget(const char *target,
           }
         }
       }
-    // make sure the tpye is correct
+    // make sure the type is correct if it is currently
+    // general.  So if you do a 
+    // target_link_libraries(foo optimized bar) it will stay
+    // optimized and not use the lookup.   As there maybe the
+    // case where someone has specifed that a library is both
+    // debug and optimized.
     std::string linkType = lib;
     linkType += "_LINK_TYPE";
     const char* linkTypeString = this->GetDefinition( linkType.c_str() );
-    if(linkTypeString)
+    if(llt == cmTarget::GENERAL &&  linkTypeString)
       {
       if(strcmp(linkTypeString, "debug") == 0)
         {