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

Revert LINK_SEARCH_{START,END}_STATIC behavior change

Browse Source 
The changes to cmComputeLinkInformation.cxx in commit 675ef165 (Allow
LINK_SEARCH_{START,END}_STATIC props to have default values, 2015-08-07)
are unrelated to the feature added by that change and are incorrect.
They lead to cases of extra -Bdynamic flags.  Revert them.
This commit is contained in:
Brad King 2015-08-28 11:45:45 -04:00
parent 970a741f7d
commit 9e21b01a4d
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/cmComputeLinkInformation.cxx
View File

@ -522,10 +522,9 @@ bool cmComputeLinkInformation::Compute()
// libraries are found. // libraries are found.
const char* lss = const char* lss =
this->Target->Target->GetProperty("LINK_SEARCH_END_STATIC"); this->Target->Target->GetProperty("LINK_SEARCH_END_STATIC");
if(lss) if(cmSystemTools::IsOn(lss))
{ {
this->SetCurrentLinkType( this->SetCurrentLinkType(LinkStatic);
cmSystemTools::IsOn(lss) ? LinkStatic : LinkShared);
} }
else else
{ {
@ -863,8 +862,7 @@ void cmComputeLinkInformation::ComputeLinkTypeInfo()
const char* lss = const char* lss =
this->Target->Target->GetProperty("LINK_SEARCH_START_STATIC"); this->Target->Target->GetProperty("LINK_SEARCH_START_STATIC");
this->StartLinkType = cmSystemTools::IsOn(lss)? LinkStatic : LinkShared; this->StartLinkType = cmSystemTools::IsOn(lss)? LinkStatic : LinkShared;
this->CurrentLinkType = LinkUnknown; this->CurrentLinkType = this->StartLinkType;
this->SetCurrentLinkType(this->StartLinkType);
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------