[Cmake-commits] CMake branch, next, updated. v2.8.4-1163-gc05ee31

[Brad King]

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  c05ee313b130d3574ddf1277fa43bb694237c234 (commit)
       via  c9d55ae5b9dceb90c735df72b7c487d0a75b2b62 (commit)
      from  50252f3142468710e6399ecbaae08518ffb2eec9 (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=c05ee313b130d3574ddf1277fa43bb694237c234
commit c05ee313b130d3574ddf1277fa43bb694237c234
Merge: 50252f3 c9d55ae
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Mar 14 15:37:27 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Mar 14 15:37:27 2011 -0400

    Merge topic 'module-link-interface-issue-11945' into next
    
    c9d55ae Add parens in cmTarget::ComputeLinkInterface logic


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c9d55ae5b9dceb90c735df72b7c487d0a75b2b62
commit c9d55ae5b9dceb90c735df72b7c487d0a75b2b62
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Mar 14 15:34:26 2011 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Mar 14 15:34:26 2011 -0400

    Add parens in cmTarget::ComputeLinkInterface logic
    
    Avoid GCC warning
    
      warning: suggest parentheses around ‘&&’ within ‘||’ [-Wparentheses]
    
    added by commit c6a8e4c7 (The link interface of MODULE libraries is
    empty, 2011-03-09).

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index b5900c4..e8593a1 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -4284,7 +4284,7 @@ bool cmTarget::ComputeLinkInterface(const char* config, LinkInterface& iface)
   bool canLinkModules = this->Makefile->NeedBackwardsCompatibility(2,2);
   if(!explicitLibraries &&
      (this->GetType() == cmTarget::EXECUTABLE ||
-      this->GetType() == cmTarget::MODULE_LIBRARY && !canLinkModules))
+      (this->GetType() == cmTarget::MODULE_LIBRARY && !canLinkModules)))
     {
     return false;
     }

-----------------------------------------------------------------------

Summary of changes:
 Source/cmTarget.cxx |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake