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 203306cfc18d29686c6f6742d7960356c044438d (commit)
via 9746b09d4eac6252e4edca12b204284367af8c93 (commit)
from cf3138b2ec9150f33bf1fc9c5893a3b8135f8605 (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=203306cfc18d29686c6f6742d7960356c044438d
commit 203306cfc18d29686c6f6742d7960356c044438d
Merge: cf3138b 9746b09
Author: Chuck Atkins <chuck.atk...@kitware.com>
AuthorDate: Mon Aug 31 11:22:25 2015 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Mon Aug 31 11:22:25 2015 -0400
Merge topic 'fix-link-search-start-logic' into next
9746b09d cmComputeLinkInformation: Fix build error
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9746b09d4eac6252e4edca12b204284367af8c93
commit 9746b09d4eac6252e4edca12b204284367af8c93
Author: Chuck Atkins <chuck.atk...@kitware.com>
AuthorDate: Mon Aug 31 11:21:57 2015 -0400
Commit: Chuck Atkins <chuck.atk...@kitware.com>
CommitDate: Mon Aug 31 11:21:57 2015 -0400
cmComputeLinkInformation: Fix build error
diff --git a/Source/cmComputeLinkInformation.cxx
b/Source/cmComputeLinkInformation.cxx
index 0269db9..d35b566 100644
--- a/Source/cmComputeLinkInformation.cxx
+++ b/Source/cmComputeLinkInformation.cxx
@@ -862,7 +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 = this->StartLinkType);
+ this->CurrentLinkType = this->StartLinkType;
}
//----------------------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
Source/cmComputeLinkInformation.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
