[Cmake-commits] CMake branch, next, updated. v3.3.1-2660-g5ce9fe1
Brad King
brad.king at kitware.com
Mon Aug 31 13:10:04 EDT 2015
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 5ce9fe1efde6b17acdd0b3ae1dac0b65c0254893 (commit)
via 9e21b01a4d4781cdcfb8990bdf72a11c83da3887 (commit)
from 71dd6bfbbdcc4a91322ae233021c91d6899c2691 (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=5ce9fe1efde6b17acdd0b3ae1dac0b65c0254893
commit 5ce9fe1efde6b17acdd0b3ae1dac0b65c0254893
Merge: 71dd6bf 9e21b01
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Aug 31 13:10:03 2015 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Aug 31 13:10:03 2015 -0400
Merge topic 'add-link-search-static-properties-defaults' into next
9e21b01a Revert LINK_SEARCH_{START,END}_STATIC behavior change
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9e21b01a4d4781cdcfb8990bdf72a11c83da3887
commit 9e21b01a4d4781cdcfb8990bdf72a11c83da3887
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Aug 28 11:45:45 2015 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Aug 31 13:08:53 2015 -0400
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.
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;
}
//----------------------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list