[Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-266-g0514163

[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  05141639287767e46a89e4f68b6d91f6fffd5e06 (commit)
       via  34db99de453188fa908dbd2793fbeb8b9472817d (commit)
      from  053a8bd3160f5b5a0867ca8bc42fe8314b50189b (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=05141639287767e46a89e4f68b6d91f6fffd5e06
commit 05141639287767e46a89e4f68b6d91f6fffd5e06
Merge: 053a8bd 34db99d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 8 18:54:52 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 8 18:54:52 2015 -0400

    Merge topic 'use-generator-target' into next
    
    34db99de Mac fixups.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=34db99de453188fa908dbd2793fbeb8b9472817d
commit 34db99de453188fa908dbd2793fbeb8b9472817d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 9 00:54:20 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Oct 9 00:54:27 2015 +0200

    Mac fixups.

diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 9f71cc5..0370d74 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -1977,7 +1977,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
       {
       if(!gtgt->UsesDefaultOutputDir(configName, false))
         {
-        std::string pncdir = target.GetDirectory(configName);
+        std::string pncdir = gtgt->GetDirectory(configName);
         buildSettings->AddAttribute("CONFIGURATION_BUILD_DIR",
                                     this->CreateString(pncdir.c_str()));
         }
@@ -1986,7 +1986,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
       {
       buildSettings->AddAttribute("OBJROOT",
                                   this->CreateString(pndir.c_str()));
-      pndir = target.GetDirectory(configName);
+      pndir = gtgt->GetDirectory(configName);
       }
 
     if(target.IsFrameworkOnApple() || target.IsCFBundleOnApple())

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

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


hooks/post-receive
-- 
CMake