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

Merge topic 'add-link-search-static-properties-defaults' 

9e21b01a Revert LINK_SEARCH_{START,END}_STATIC behavior change
This commit is contained in:
Brad King 2015-09-01 09:53:21 -04:00 committed by CMake Topic Stage
parent 02ab8e30c1 9e21b01a4d
commit d833df1228
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);
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------