[cmake-commits] hoffman committed cmMakefile.cxx 1.335.2.7 1.335.2.8

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv444/Source

Modified Files:
      Tag: CMake-2-4
	cmMakefile.cxx 
Log Message:
ENH: move fix from main tree 


Index: cmMakefile.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmMakefile.cxx,v
retrieving revision 1.335.2.7
retrieving revision 1.335.2.8
diff -u -d -r1.335.2.7 -r1.335.2.8
--- cmMakefile.cxx	13 Oct 2006 14:52:05 -0000	1.335.2.7
+++ cmMakefile.cxx	16 Nov 2006 20:57:50 -0000	1.335.2.8
@@ -954,6 +954,21 @@
         }
       }
       }
+    // make sure the tpye is correct
+    std::string linkType = lib;
+    linkType += "_LINK_TYPE";
+    const char* linkTypeString = this->GetDefinition( linkType.c_str() );
+    if(linkTypeString)
+      {
+      if(strcmp(linkTypeString, "debug") == 0)
+        {
+        llt = cmTarget::DEBUG;
+        }
+      if(strcmp(linkTypeString, "optimized") == 0)
+        {
+        llt = cmTarget::OPTIMIZED;
+        }
+      }
     i->second.AddLinkLibrary( *this, target, lib, llt );
     }
   else