summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2007-03-09 18:56:45 (GMT)
committerBrad King <brad.king@kitware.com>2007-03-09 18:56:45 (GMT)
commit7b68a64d12a3f6a35020b1519db48b5c8ed007f8 (patch)
tree43c54612fab759b2e9532c3fd31a097d0a800f48 /Source
parent50ed755b5b9bbeb0b0af3b2d2302f4a93d03c3c3 (diff)
downloadCMake-7b68a64d12a3f6a35020b1519db48b5c8ed007f8.zip
CMake-7b68a64d12a3f6a35020b1519db48b5c8ed007f8.tar.gz
CMake-7b68a64d12a3f6a35020b1519db48b5c8ed007f8.tar.bz2
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.
Diffstat (limited to 'Source')
-rw-r--r--Source/cmMakefileLibraryTargetGenerator.cxx12
1 files changed, 9 insertions, 3 deletions
diff --git a/Source/cmMakefileLibraryTargetGenerator.cxx b/Source/cmMakefileLibraryTargetGenerator.cxx
index 7797c91..d1398a1 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;