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

ENH: fix bug for single char libraries

Browse Source
This commit is contained in:
Bill Hoffman 2006-02-10 10:11:16 -05:00
parent 8b4af97281
commit 6cccf0ab30
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/cmLocalGenerator.cxx
View File

@ -1466,8 +1466,8 @@ cmLocalGenerator::ComputeLinkInformation(cmTarget& target,
} }
pos = lib.find_last_not_of(" \t\r\n"); pos = lib.find_last_not_of(" \t\r\n");
if(pos != lib.npos) if(pos != lib.npos)
{ {
lib = lib.substr(0, pos); lib = lib.substr(0, pos+1);
} }
if(lib.empty()) if(lib.empty())
{ {
@ -1477,11 +1477,11 @@ cmLocalGenerator::ComputeLinkInformation(cmTarget& target,
// Link to a library if it is not the same target and is meant for // Link to a library if it is not the same target and is meant for
// this configuration type. // this configuration type.
if((target.GetType() == cmTarget::EXECUTABLE || if((target.GetType() == cmTarget::EXECUTABLE ||
j->first != target.GetName()) && lib != target.GetName()) &&
(j->second == cmTarget::GENERAL || j->second == linkType)) (j->second == cmTarget::GENERAL || j->second == linkType))
{ {
// Compute the proper name to use to link this library. // Compute the proper name to use to link this library.
cmTarget* tgt = m_GlobalGenerator->FindTarget(0, j->first.c_str()); cmTarget* tgt = m_GlobalGenerator->FindTarget(0, lib.c_str());
if(tgt) if(tgt)
{ {
// This is a CMake target. Ask the target for its real name. // This is a CMake target. Ask the target for its real name.
@ -1494,7 +1494,7 @@ cmLocalGenerator::ComputeLinkInformation(cmTarget& target,
else else
{ {
// This is not a CMake target. Use the name given. // This is not a CMake target. Use the name given.
linkLibraries.push_back(j->first); linkLibraries.push_back(lib);
} }
} }
} }