diff options
| author | Brad King <brad.king@kitware.com> | 2015-08-28 15:45:45 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-08-31 17:08:53 (GMT) |
| commit | 9e21b01a4d4781cdcfb8990bdf72a11c83da3887 (patch) | |
| tree | d58e7e98eba68d068258c42ae3cbbc2924d8857e /Source/cmComputeLinkInformation.cxx | |
| parent | 970a741f7db74e67d6b33dc80b39ac2f3cd8b855 (diff) | |
| download | CMake-9e21b01a4d4781cdcfb8990bdf72a11c83da3887.zip CMake-9e21b01a4d4781cdcfb8990bdf72a11c83da3887.tar.gz CMake-9e21b01a4d4781cdcfb8990bdf72a11c83da3887.tar.bz2 | |
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.
Diffstat (limited to 'Source/cmComputeLinkInformation.cxx')
| -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 12dddd2..c16472e 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; } //---------------------------------------------------------------------------- |