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 71dd6bfbbdcc4a91322ae233021c91d6899c2691 (commit) via f3eb5815cc507f0bd07db36c57dda10033db1436 (commit) from 203306cfc18d29686c6f6742d7960356c044438d (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=71dd6bfbbdcc4a91322ae233021c91d6899c2691 commit 71dd6bfbbdcc4a91322ae233021c91d6899c2691 Merge: 203306c f3eb581 Author: Chuck Atkins <chuck.atk...@kitware.com> AuthorDate: Mon Aug 31 11:22:50 2015 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Mon Aug 31 11:22:50 2015 -0400 Merge topic 'fix-link-search-start-logic' into next f3eb5815 cmComputeLinkInformation: Fix bad logic for LINK_SEARCH_*STATIC http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f3eb5815cc507f0bd07db36c57dda10033db1436 commit f3eb5815cc507f0bd07db36c57dda10033db1436 Author: Chuck Atkins <chuck.atk...@kitware.com> AuthorDate: Sun Aug 30 17:44:01 2015 -0400 Commit: Chuck Atkins <chuck.atk...@kitware.com> CommitDate: Mon Aug 31 11:22:36 2015 -0400 cmComputeLinkInformation: Fix bad logic for LINK_SEARCH_*STATIC In commit 675ef165, a bug was introduced that treated the LINK_SEARCH_START_STATIC and LINK_SEARCH_END_STATIC as ternary properties instead of boolean. This reverts those changes back to the previous behavior in cmComputeLinkInformation. 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; } //---------------------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits