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

BUG: Do not add non-per-config subdirectory name of cmake target libraries as full path libs.

Browse Source
This commit is contained in:
Brad King 2006-04-11 11:40:24 -04:00
parent d5719f22c1
commit acf33ba191
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Source/cmLocalGenerator.cxx
View File

@ -1399,6 +1399,8 @@ cmLocalGenerator::ComputeLinkInformation(cmTarget& target,
linkItem += "/"; linkItem += "/";
linkItem += tgt->GetFullName(config); linkItem += tgt->GetFullName(config);
linkLibraries.push_back(linkItem); linkLibraries.push_back(linkItem);
// For full path, use the true location.
if(fullPathLibs) if(fullPathLibs)
{ {
fullPathLibs->push_back(tgt->GetFullPath(config)); fullPathLibs->push_back(tgt->GetFullPath(config));
@ -1408,6 +1410,14 @@ cmLocalGenerator::ComputeLinkInformation(cmTarget& target,
{ {
// This is not a CMake target. Use the name given. // This is not a CMake target. Use the name given.
linkLibraries.push_back(lib); linkLibraries.push_back(lib);
// Add to the list of full paths if this library is one.
if(fullPathLibs &&
cmSystemTools::FileIsFullPath(lib.c_str()) &&
!cmSystemTools::FileIsDirectory(lib.c_str()))
{
fullPathLibs->push_back(lib);
}
} }
} }
} }
@ -1450,10 +1460,6 @@ cmLocalGenerator::ComputeLinkInformation(cmTarget& target,
orderLibs.DetermineLibraryPathOrder(); orderLibs.DetermineLibraryPathOrder();
std::vector<cmStdString> orderedLibs; std::vector<cmStdString> orderedLibs;
orderLibs.GetLinkerInformation(outDirs, orderedLibs); orderLibs.GetLinkerInformation(outDirs, orderedLibs);
if(fullPathLibs)
{
orderLibs.GetFullPathLibraries(*fullPathLibs);
}
// Make sure libraries are linked with the proper syntax. // Make sure libraries are linked with the proper syntax.
std::string libLinkFlag = std::string libLinkFlag =