[Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-268-g3ac7f94

[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  3ac7f941aecd14571dd4f2100407b4136ef8c676 (commit)
       via  d9e8923e6028730754720cd3234c989757707e83 (commit)
      from  05141639287767e46a89e4f68b6d91f6fffd5e06 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3ac7f941aecd14571dd4f2100407b4136ef8c676
commit 3ac7f941aecd14571dd4f2100407b4136ef8c676
Merge: 0514163 d9e8923
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 8 19:01:47 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 8 19:01:47 2015 -0400

    Merge topic 'use-generator-target' into next
    
    d9e8923e fixup! cmGeneratorTarget: Move HasMacOSXRpathInstallNameDir from cmTarget.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d9e8923e6028730754720cd3234c989757707e83
commit d9e8923e6028730754720cd3234c989757707e83
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 9 01:01:05 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Oct 9 01:01:05 2015 +0200

    fixup! cmGeneratorTarget: Move HasMacOSXRpathInstallNameDir from cmTarget.

diff --git a/Source/cmLocalXCodeGenerator.cxx b/Source/cmLocalXCodeGenerator.cxx
index b19112d..70997bf 100644
--- a/Source/cmLocalXCodeGenerator.cxx
+++ b/Source/cmLocalXCodeGenerator.cxx
@@ -56,7 +56,8 @@ void cmLocalXCodeGenerator::Generate()
       iter != targets.end(); ++iter)
     {
     cmTarget* t = &iter->second;
-    t->HasMacOSXRpathInstallNameDir("");
+    cmGeneratorTarget* gt = this->GlobalGenerator->GetGeneratorTarget(t);
+    gt->HasMacOSXRpathInstallNameDir("");
     }
 }
 
@@ -70,7 +71,8 @@ void cmLocalXCodeGenerator::GenerateInstallRules()
       iter != targets.end(); ++iter)
     {
     cmTarget* t = &iter->second;
-    t->HasMacOSXRpathInstallNameDir("");
+    cmGeneratorTarget* gt = this->GlobalGenerator->GetGeneratorTarget(t);
+    gt->HasMacOSXRpathInstallNameDir("");
     }
 }
 

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

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


hooks/post-receive
-- 
CMake