diff options
| author | Brad King <brad.king@kitware.com> | 2015-09-01 13:53:21 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-09-01 13:53:21 (GMT) |
| commit | d833df1228b3482be36be8517839f4b23c789bf3 (patch) | |
| tree | 4b23723b03dcfaaf6045ad1c7f6d87d78b14d26b | |
| parent | 02ab8e30c1a8617616669cb67022b7fc1f84647d (diff) | |
| parent | 9e21b01a4d4781cdcfb8990bdf72a11c83da3887 (diff) | |
| download | CMake-d833df1228b3482be36be8517839f4b23c789bf3.zip CMake-d833df1228b3482be36be8517839f4b23c789bf3.tar.gz CMake-d833df1228b3482be36be8517839f4b23c789bf3.tar.bz2 | |
Merge topic 'add-link-search-static-properties-defaults'
9e21b01a Revert LINK_SEARCH_{START,END}_STATIC behavior change
| -rw-r--r-- | Source/cmComputeLinkInformation.cxx | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx index 4b70e5e..d35b566 100644 --- a/Source/cmComputeLinkInformation.cxx +++ b/Source/cmComputeLinkInformation.cxx @@ -522,10 +522,9 @@ bool cmComputeLinkInformation::Compute() // libraries are found. const char* lss = this->Target->Target->GetProperty("LINK_SEARCH_END_STATIC"); - if(lss) + if(cmSystemTools::IsOn(lss)) { - this->SetCurrentLinkType( - cmSystemTools::IsOn(lss) ? LinkStatic : LinkShared); + this->SetCurrentLinkType(LinkStatic); } else { @@ -863,8 +862,7 @@ void cmComputeLinkInformation::ComputeLinkTypeInfo() const char* lss = this->Target->Target->GetProperty("LINK_SEARCH_START_STATIC"); this->StartLinkType = cmSystemTools::IsOn(lss)? LinkStatic : LinkShared; - this->CurrentLinkType = LinkUnknown; - this->SetCurrentLinkType(this->StartLinkType); + this->CurrentLinkType = this->StartLinkType; } //---------------------------------------------------------------------------- |