[Cmake-commits] CMake branch, next, updated. v2.8.12.1-7027-g86f8465

Stephen Kelly steveire at gmail.com
Sat Jan 11 07:37:54 EST 2014


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  86f8465deb47e1b610904865dd9c5a314cd7a385 (commit)
       via  1446b0892a4203986299b807dfe345ffb49ca92b (commit)
      from  de359a42f708af365095538faac940acd7812f33 (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=86f8465deb47e1b610904865dd9c5a314cd7a385
commit 86f8465deb47e1b610904865dd9c5a314cd7a385
Merge: de359a4 1446b08
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Jan 11 07:37:53 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Jan 11 07:37:53 2014 -0500

    Merge topic 'use-generator-target' into next
    
    1446b08 Attempt mac fix.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1446b0892a4203986299b807dfe345ffb49ca92b
commit 1446b0892a4203986299b807dfe345ffb49ca92b
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Jan 11 13:36:56 2014 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Jan 11 13:36:56 2014 +0100

    Attempt mac fix.

diff --git a/Source/cmLocalXCodeGenerator.cxx b/Source/cmLocalXCodeGenerator.cxx
index 248b5b9..9b8fdc6 100644
--- a/Source/cmLocalXCodeGenerator.cxx
+++ b/Source/cmLocalXCodeGenerator.cxx
@@ -54,10 +54,11 @@ void cmLocalXCodeGenerator::Generate()
   for(cmGeneratorTargetsType::const_iterator iter = targets.begin();
       iter != targets.end(); ++iter)
     {
-    if (l->first->IsImported())
+    if (iter->first->IsImported())
       {
       continue;
       }
+    cmGeneratorTarget* t = iter->second;
     t->HasMacOSXRpathInstallNameDir(NULL);
     }
 }

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

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


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list