kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.

This commit is contained in:
Brad King 2007-03-09 13:56:45 -05:00
parent 50ed755b5b
commit 7b68a64d12
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/cmMakefileLibraryTargetGenerator.cxx
View File

@ -254,15 +254,21 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
outpath += "/CMakeRelink.dir"; outpath += "/CMakeRelink.dir";
cmSystemTools::MakeDirectory(outpath.c_str()); cmSystemTools::MakeDirectory(outpath.c_str());
outpath += "/"; outpath += "/";
if(!targetNameImport.empty())
{
outpathImp = outpath; outpathImp = outpath;
} }
}
else else
{ {
outpath = this->Target->GetDirectory(); outpath = this->Target->GetDirectory();
outpath += "/"; outpath += "/";
if(!targetNameImport.empty())
{
outpathImp = this->Target->GetDirectory(0, true); outpathImp = this->Target->GetDirectory(0, true);
outpathImp += "/"; outpathImp += "/";
} }
}
std::string targetFullPath = outpath + targetName; std::string targetFullPath = outpath + targetName;
std::string targetFullPathPDB = outpath + targetNamePDB; std::string targetFullPathPDB = outpath + targetNamePDB;
std::string targetFullPathSO = outpath + targetNameSO; std::string targetFullPathSO = outpath + targetNameSO;