[Cmake-commits] CMake branch, next, updated. v2.8.12.1-6341-gcb20875

[Clinton Stimpson]

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  cb20875c927590b437ad3c689cb7def074e5d9b6 (commit)
       via  85edcb2a4272fbe4e88266cbe3f5a580e2932053 (commit)
      from  26f9350b464de38c3f2c486fe13af4173e97dbff (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=cb20875c927590b437ad3c689cb7def074e5d9b6
commit cb20875c927590b437ad3c689cb7def074e5d9b6
Merge: 26f9350 85edcb2
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Sat Dec 21 00:12:23 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Dec 21 00:12:23 2013 -0500

    Merge topic 'rpath-default' into next
    
    85edcb2 Xcode: Fix CMP0042 test when using Xcode.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=85edcb2a4272fbe4e88266cbe3f5a580e2932053
commit 85edcb2a4272fbe4e88266cbe3f5a580e2932053
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Fri Dec 20 22:10:53 2013 -0700
Commit:     Clinton Stimpson <clinton at elemtech.com>
CommitDate: Fri Dec 20 22:10:53 2013 -0700

    Xcode: Fix CMP0042 test when using Xcode.

diff --git a/Source/cmLocalXCodeGenerator.cxx b/Source/cmLocalXCodeGenerator.cxx
index 7c5f69d..a9a27b9 100644
--- a/Source/cmLocalXCodeGenerator.cxx
+++ b/Source/cmLocalXCodeGenerator.cxx
@@ -12,6 +12,7 @@
 #include "cmLocalXCodeGenerator.h"
 #include "cmGlobalXCodeGenerator.h"
 #include "cmSourceFile.h"
+#include "cmMakefile.h"
 
 //----------------------------------------------------------------------------
 cmLocalXCodeGenerator::cmLocalXCodeGenerator()
@@ -42,3 +43,31 @@ void cmLocalXCodeGenerator::AppendFlagEscape(std::string& flags,
     static_cast<cmGlobalXCodeGenerator*>(this->GlobalGenerator);
   gg->AppendFlag(flags, rawFlag);
 }
+
+//----------------------------------------------------------------------------
+void cmLocalXCodeGenerator::Generate()
+{
+  cmLocalGenerator::Generate();
+
+  cmTargets& targets = this->Makefile->GetTargets();
+  for(cmTargets::iterator iter = targets.begin();
+      iter != targets.end(); ++iter)
+    {
+    cmTarget* t = &iter->second;
+    t->HasMacOSXRpathInstallNameDir(NULL);
+    }
+}
+
+//----------------------------------------------------------------------------
+void cmLocalXCodeGenerator::GenerateInstallRules()
+{
+  cmLocalGenerator::GenerateInstallRules();
+
+  cmTargets& targets = this->Makefile->GetTargets();
+  for(cmTargets::iterator iter = targets.begin();
+      iter != targets.end(); ++iter)
+    {
+    cmTarget* t = &iter->second;
+    t->HasMacOSXRpathInstallNameDir(NULL);
+    }
+}
diff --git a/Source/cmLocalXCodeGenerator.h b/Source/cmLocalXCodeGenerator.h
index d97a41c..edd2f5b 100644
--- a/Source/cmLocalXCodeGenerator.h
+++ b/Source/cmLocalXCodeGenerator.h
@@ -29,6 +29,8 @@ public:
   virtual ~cmLocalXCodeGenerator();
   virtual std::string GetTargetDirectory(cmTarget const& target) const;
   virtual void AppendFlagEscape(std::string& flags, const char* rawFlag);
+  virtual void Generate();
+  virtual void GenerateInstallRules();
 private:
 
 };

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

Summary of changes:
 Source/cmLocalXCodeGenerator.cxx |   29 +++++++++++++++++++++++++++++
 Source/cmLocalXCodeGenerator.h   |    2 ++
 2 files changed, 31 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake