[Cmake-commits] CMake branch, next, updated. v2.8.6-1773-g1094aac
Stephen Kelly
steveire at gmail.com
Wed Nov 2 09:03:14 EDT 2011
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 1094aac9d6f119493ae492060c0958471b0dc986 (commit)
via f251ab2abc96073a5952014868c59d21e5fc513b (commit)
from 08c020cda0a8afb01aee22b155b42bdf63df16f3 (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=1094aac9d6f119493ae492060c0958471b0dc986
commit 1094aac9d6f119493ae492060c0958471b0dc986
Merge: 08c020c f251ab2
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Nov 2 09:02:58 2011 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Nov 2 09:02:58 2011 -0400
Merge topic 'target-link-libraries-interfaces' into next
f251ab2 Don't confuse Interface with Libraries.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f251ab2abc96073a5952014868c59d21e5fc513b
commit f251ab2abc96073a5952014868c59d21e5fc513b
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Nov 2 13:59:28 2011 +0100
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Nov 2 13:59:28 2011 +0100
Don't confuse Interface with Libraries.
diff --git a/Source/cmTargetLinkLibrariesCommand.cxx b/Source/cmTargetLinkLibrariesCommand.cxx
index ab35c97..0db5943 100644
--- a/Source/cmTargetLinkLibrariesCommand.cxx
+++ b/Source/cmTargetLinkLibrariesCommand.cxx
@@ -217,7 +217,7 @@ bool cmTargetLinkLibrariesCommand
// Use of any of the new keywords implies awareness of
// this property. And if no libraries are named, it should
// result in an empty link interface.
- if((this->CurrentProcessingState != ProcessingLinkInterface)
+ if((this->CurrentProcessingState != ProcessingLinkLibraries)
&& !this->Target->GetProperty("LINK_INTERFACE_LIBRARIES"))
{
this->Target->SetProperty("LINK_INTERFACE_LIBRARIES", "");
-----------------------------------------------------------------------
Summary of changes:
Source/cmTargetLinkLibrariesCommand.cxx | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list