This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 8a72b18cb37592bd896d12570cbe82787b9cdc74 (commit)
via 293e9f7a61810ac30789e5f34b416125f327d03a (commit)
from f83cd172f23d35bdf2552dfcc781914f7b46e968 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8a72b18cb37592bd896d12570cbe82787b9cdc74
commit 8a72b18cb37592bd896d12570cbe82787b9cdc74
Merge: f83cd17 293e9f7
Author: Chuck Atkins <chuck.atk...@kitware.com>
AuthorDate: Mon Aug 31 11:13:57 2015 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Mon Aug 31 11:13:57 2015 -0400
Merge topic 'fix-link-search-start-logic' into next
293e9f7a cmComputeLinkInformation: Revert changes from 675ef165
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=293e9f7a61810ac30789e5f34b416125f327d03a
commit 293e9f7a61810ac30789e5f34b416125f327d03a
Author: Chuck Atkins <chuck.atk...@kitware.com>
AuthorDate: Mon Aug 31 11:13:18 2015 -0400
Commit: Chuck Atkins <chuck.atk...@kitware.com>
CommitDate: Mon Aug 31 11:13:18 2015 -0400
cmComputeLinkInformation: Revert changes from 675ef165
diff --git a/Source/cmComputeLinkInformation.cxx
b/Source/cmComputeLinkInformation.cxx
index 686052c..0269db9 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 = LinkShared;
- this->SetCurrentLinkType(this->StartLinkType);
+ this->CurrentLinkType = this->StartLinkType);
}
//----------------------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
Source/cmComputeLinkInformation.cxx | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
