From 7b68a64d12a3f6a35020b1519db48b5c8ed007f8 Mon Sep 17 00:00:00 2001 From: Brad King Date: Fri, 9 Mar 2007 13:56:45 -0500 Subject: [PATCH] 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. --- Source/cmMakefileLibraryTargetGenerator.cxx | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/Source/cmMakefileLibraryTargetGenerator.cxx b/Source/cmMakefileLibraryTargetGenerator.cxx index 7797c914e..d1398a182 100644 --- a/Source/cmMakefileLibraryTargetGenerator.cxx +++ b/Source/cmMakefileLibraryTargetGenerator.cxx @@ -254,14 +254,20 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules 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;