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 cf3138b2ec9150f33bf1fc9c5893a3b8135f8605 (commit)
via 586a95d01184aa2300a3a32572c688cbf648106c (commit)
from 8a72b18cb37592bd896d12570cbe82787b9cdc74 (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=cf3138b2ec9150f33bf1fc9c5893a3b8135f8605
commit cf3138b2ec9150f33bf1fc9c5893a3b8135f8605
Merge: 8a72b18 586a95d
Author: Chuck Atkins <chuck.atk...@kitware.com>
AuthorDate: Mon Aug 31 11:20:37 2015 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Mon Aug 31 11:20:37 2015 -0400
Merge topic 'fix-link-search-start-logic' into next
586a95d0 cmComputeLinkInformation: Fix bad logic for LINK_SEARCH_*STATIC
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=586a95d01184aa2300a3a32572c688cbf648106c
commit 586a95d01184aa2300a3a32572c688cbf648106c
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:14:38 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..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 = 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
