[Cmake-commits] CMake branch, next, updated. v2.8.11.2-4121-g0d809f9

[Stephen Kelly]

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  0d809f9e9fbb594345af24bdd56cd5e428d239d5 (commit)
       via  125e7a2ee3155291b8282c52fa2fd410b4858f03 (commit)
      from  90a352d685d698f807198e4b5144a651b8b63b27 (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=0d809f9e9fbb594345af24bdd56cd5e428d239d5
commit 0d809f9e9fbb594345af24bdd56cd5e428d239d5
Merge: 90a352d 125e7a2
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Sep 11 06:30:50 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Sep 11 06:30:50 2013 -0400

    Merge topic 'INTERFACE_LIBRARY-target-type' into next
    
    125e7a2 Fix build of Xcode generator.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=125e7a2ee3155291b8282c52fa2fd410b4858f03
commit 125e7a2ee3155291b8282c52fa2fd410b4858f03
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Sep 11 12:29:19 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Sep 11 12:29:19 2013 +0200

    Fix build of Xcode generator.

diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 4b702a2..ea5781f 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -2842,8 +2842,8 @@ void cmGlobalXCodeGenerator
         {
         linkLibs += this->XCodeEscapePath(li->Value.c_str());
         }
-      else if (!l->Target
-          || l->Target->GetType() != cmTarget::INTERFACE_LIBRARY)
+      else if (!li->Target
+          || li->Target->GetType() != cmTarget::INTERFACE_LIBRARY)
         {
         linkLibs += li->Value;
         }

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

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


hooks/post-receive
-- 
CMake