[Cmake-commits] CMake branch, next, updated. v3.4.0-rc2-932-g6052702

[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  60527028258a114ce5b7bfb5779f2611f1c1a2c6 (commit)
       via  b2989d1bfc2730b1539c587142a23f7cbaa3088c (commit)
       via  3fdb3490503041d999e8381c11a1e431953204df (commit)
      from  b7fb0ad756d908018ecc53ab50c153ec22b4bf4a (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=60527028258a114ce5b7bfb5779f2611f1c1a2c6
commit 60527028258a114ce5b7bfb5779f2611f1c1a2c6
Merge: b7fb0ad b2989d1
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 24 03:19:45 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Oct 24 03:19:45 2015 -0400

    Merge topic 'use-generator-target' into next
    
    b2989d1b Revert "Xcode: Remove value-less overrides."
    3fdb3490 fixup! VS: Port interface to cmGeneratorTarget


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b2989d1bfc2730b1539c587142a23f7cbaa3088c
commit b2989d1bfc2730b1539c587142a23f7cbaa3088c
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 24 09:18:35 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 24 09:18:35 2015 +0200

    Revert "Xcode: Remove value-less overrides."
    
    This reverts commit e20951c90df511cf0374a9fa6d27ad8a131b4903.

diff --git a/Source/cmLocalXCodeGenerator.cxx b/Source/cmLocalXCodeGenerator.cxx
index 30fd075..3b430d2 100644
--- a/Source/cmLocalXCodeGenerator.cxx
+++ b/Source/cmLocalXCodeGenerator.cxx
@@ -47,6 +47,36 @@ void cmLocalXCodeGenerator::AppendFlagEscape(std::string& flags,
 }
 
 //----------------------------------------------------------------------------
+void cmLocalXCodeGenerator::Generate()
+{
+  cmLocalGenerator::Generate();
+
+  cmTargets& targets = this->Makefile->GetTargets();
+  for(cmTargets::iterator iter = targets.begin();
+      iter != targets.end(); ++iter)
+    {
+    cmTarget* t = &iter->second;
+    cmGeneratorTarget* gt = this->GlobalGenerator->GetGeneratorTarget(t);
+    gt->HasMacOSXRpathInstallNameDir("");
+    }
+}
+
+//----------------------------------------------------------------------------
+void cmLocalXCodeGenerator::GenerateInstallRules()
+{
+  cmLocalGenerator::GenerateInstallRules();
+
+  cmTargets& targets = this->Makefile->GetTargets();
+  for(cmTargets::iterator iter = targets.begin();
+      iter != targets.end(); ++iter)
+    {
+    cmTarget* t = &iter->second;
+    cmGeneratorTarget* gt = this->GlobalGenerator->GetGeneratorTarget(t);
+    gt->HasMacOSXRpathInstallNameDir("");
+    }
+}
+
+//----------------------------------------------------------------------------
 void cmLocalXCodeGenerator::ComputeObjectFilenames(
                         std::map<cmSourceFile const*, std::string>& mapping,
                         cmGeneratorTarget const*)
diff --git a/Source/cmLocalXCodeGenerator.h b/Source/cmLocalXCodeGenerator.h
index 57c1579..4381a6d 100644
--- a/Source/cmLocalXCodeGenerator.h
+++ b/Source/cmLocalXCodeGenerator.h
@@ -32,6 +32,8 @@ public:
   std::string GetTargetDirectory(cmGeneratorTarget const* target) const;
   virtual void AppendFlagEscape(std::string& flags,
                                 const std::string& rawFlag);
+  virtual void Generate();
+  virtual void GenerateInstallRules();
   virtual void ComputeObjectFilenames(
                         std::map<cmSourceFile const*, std::string>& mapping,
                         cmGeneratorTarget const* gt = 0);

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3fdb3490503041d999e8381c11a1e431953204df
commit 3fdb3490503041d999e8381c11a1e431953204df
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 24 09:18:11 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 24 09:18:11 2015 +0200

    fixup! VS: Port interface to cmGeneratorTarget

diff --git a/Source/cmGlobalVisualStudio8Generator.cxx b/Source/cmGlobalVisualStudio8Generator.cxx
index e185c8e..bdb1b25 100644
--- a/Source/cmGlobalVisualStudio8Generator.cxx
+++ b/Source/cmGlobalVisualStudio8Generator.cxx
@@ -468,7 +468,7 @@ bool cmGlobalVisualStudio8Generator::NeedLinkLibraryDependencies(
       ui != target->Target->GetUtilities().end(); ++ui)
     {
     if(cmGeneratorTarget* depTarget =
-        this->FindGeneratorTarget(ui->c_str()))
+        target->GetLocalGenerator()->FindGeneratorTargetToUse(ui->c_str()))
       {
       if(depTarget->GetType() != cmState::INTERFACE_LIBRARY
           && depTarget->GetProperty("EXTERNAL_MSPROJECT"))

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

Summary of changes:
 Source/cmGlobalVisualStudio8Generator.cxx |    2 +-
 Source/cmLocalXCodeGenerator.cxx          |   30 +++++++++++++++++++++++++++++
 Source/cmLocalXCodeGenerator.h            |    2 ++
 3 files changed, 33 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake