[cmake-commits] hoffman committed cmMakefile.cxx 1.362 1.363

[cmake-commits at cmake.org]

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

Modified Files:
	cmMakefile.cxx 
Log Message:
ENH: fix for when a library is tagged both debug and optimized


Index: cmMakefile.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmMakefile.cxx,v
retrieving revision 1.362
retrieving revision 1.363
diff -u -d -r1.362 -r1.363
--- cmMakefile.cxx	17 Nov 2006 20:35:09 -0000	1.362
+++ cmMakefile.cxx	20 Nov 2006 18:57:12 -0000	1.363
@@ -954,11 +954,16 @@
           }
         }
       }
-    // 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)
         {