From 9e21b01a4d4781cdcfb8990bdf72a11c83da3887 Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Fri, 28 Aug 2015 11:45:45 -0400
Subject: [PATCH] Revert LINK_SEARCH_{START,END}_STATIC behavior change
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.
---
Source/cmComputeLinkInformation.cxx | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx
index 12dddd21cb..c16472ef56 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;
}
//----------------------------------------------------------------------------
--
GitLab