[cmake-commits] king committed cmMakefileLibraryTargetGenerator.cxx 1.37 1.38

[cmake-commits at cmake.org]

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

Modified Files:
	cmMakefileLibraryTargetGenerator.cxx 
Log Message:
ENH: Do not compute a path name for the import library if there is no import library.  This simplifies tracking down problems with trying to create import libraries for MODULEs.


Index: cmMakefileLibraryTargetGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmMakefileLibraryTargetGenerator.cxx,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- cmMakefileLibraryTargetGenerator.cxx	9 Mar 2007 16:29:15 -0000	1.37
+++ cmMakefileLibraryTargetGenerator.cxx	9 Mar 2007 18:56:45 -0000	1.38
@@ -254,14 +254,20 @@
     outpath += "/CMakeRelink.dir";
     cmSystemTools::MakeDirectory(outpath.c_str());
     outpath += "/";
-    outpathImp = outpath;
+    if(!targetNameImport.empty())
+      {
+      outpathImp = outpath;
+      }
     }
   else
     {
     outpath = this->Target->GetDirectory();
     outpath += "/";
-    outpathImp = this->Target->GetDirectory(0, true);
-    outpathImp += "/";
+    if(!targetNameImport.empty())
+      {
+      outpathImp = this->Target->GetDirectory(0, true);
+      outpathImp += "/";
+      }
     }
   std::string targetFullPath = outpath + targetName;
   std::string targetFullPathPDB = outpath + targetNamePDB;