[cmake-commits] king committed cmTarget.cxx 1.192 1.193

cmake-commits at cmake.org cmake-commits at cmake.org
Wed Feb 6 14:19:05 EST 2008


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

Modified Files:
	cmTarget.cxx 
Log Message:
BUG: Make sure linking to a shared lib on windows uses import library and not the new realname.


Index: cmTarget.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmTarget.cxx,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -d -r1.192 -r1.193
--- cmTarget.cxx	6 Feb 2008 19:06:50 -0000	1.192
+++ cmTarget.cxx	6 Feb 2008 19:19:03 -0000	1.193
@@ -2093,13 +2093,17 @@
   fpath += "/";
 
   // Add the full name of the target.
-  if(realname)
+  if(implib)
+    {
+    fpath += this->GetFullName(config, true);
+    }
+  else if(realname)
     {
     fpath += this->NormalGetRealName(config);
     }
   else
     {
-    fpath += this->GetFullName(config, implib);
+    fpath += this->GetFullName(config, false);
     }
   return fpath;
 }



More information about the Cmake-commits mailing list