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 6a01363837ba4aec29d788cdf89023a5470de460 (commit) via 77d483541c406847646ae1a355a4693e7b48e3e9 (commit) via 2e4eb137b91f93c0fb48351a613790435a3fd63e (commit) via 746c9f8882affae813f12e48c01332f251d86fbf (commit) from 772e19214951cd767510ff2a464e9ffb5b5e220c (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=6a01363837ba4aec29d788cdf89023a5470de460 commit 6a01363837ba4aec29d788cdf89023a5470de460 Merge: 772e192 77d4835 Author: Chuck Atkins <chuck.atk...@kitware.com> AuthorDate: Sun Aug 30 17:49:55 2015 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Sun Aug 30 17:49:55 2015 -0400 Merge topic 'fix-link-search-start-logic' into next 77d48354 cmComputeLinkInformation: Fix bad logic for LINK_SEARCH_START_STATIC 2e4eb137 CMake Nightly Date Stamp 746c9f88 CMake Nightly Date Stamp http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=77d483541c406847646ae1a355a4693e7b48e3e9 commit 77d483541c406847646ae1a355a4693e7b48e3e9 Author: Chuck Atkins <chuck.atk...@kitware.com> AuthorDate: Sun Aug 30 17:44:01 2015 -0400 Commit: Chuck Atkins <chuck.atk...@kitware.com> CommitDate: Sun Aug 30 17:44:01 2015 -0400 cmComputeLinkInformation: Fix bad logic for LINK_SEARCH_START_STATIC In commit 675ef165, a but was introduced that always started the link line with -Wl,-Bstatic or -Wl,-Bdynamic by assuming no default link type. This commit fixes that by assuming the default start link type is shared. diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx index 4b70e5e..686052c 100644 --- a/Source/cmComputeLinkInformation.cxx +++ b/Source/cmComputeLinkInformation.cxx @@ -863,7 +863,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->CurrentLinkType = LinkShared; this->SetCurrentLinkType(this->StartLinkType); } ----------------------------------------------------------------------- Summary of changes: Source/CMakeVersion.cmake | 2 +- Source/cmComputeLinkInformation.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits