[Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-172-g51b5214

[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  51b5214b4bd684bb6beddafc30a94f27dbcaf251 (commit)
       via  7bfa629436654ff4b5704bd0b252326b58e096ba (commit)
       via  a18b86b9c44ce4d669bf4719c2addf3f79628333 (commit)
      from  fa30a5b222994d34b85ee015fd00427cbce59703 (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=51b5214b4bd684bb6beddafc30a94f27dbcaf251
commit 51b5214b4bd684bb6beddafc30a94f27dbcaf251
Merge: fa30a5b 7bfa629
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 7 15:33:13 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 7 15:33:13 2015 -0400

    Merge topic 'add-cmLocalGenerator-API' into next
    
    7bfa6294 fixup! cmLocalGenerator: Add Home directory accessors.
    a18b86b9 fixup! cmLocalGenerator: Add current binary directory accessor.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7bfa629436654ff4b5704bd0b252326b58e096ba
commit 7bfa629436654ff4b5704bd0b252326b58e096ba
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 7 21:32:49 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 7 21:32:49 2015 +0200

    fixup! cmLocalGenerator: Add Home directory accessors.

diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 1d6b8b9..201b02c 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -590,7 +590,7 @@ void cmGlobalXCodeGenerator::CreateReRunCMakeFile(
     (this->CurrentReRunCMakeMakefile.c_str());
   makefileStream.SetCopyIfDifferent(true);
   makefileStream << "# Generated by CMake, DO NOT EDIT\n";
-  std::string checkCache = root->GetHomeOutputDirectory();
+  std::string checkCache = root->GetBinaryDirectory();
   checkCache += "/";
   checkCache += cmake::GetCMakeFilesDirectoryPostSlash();
   checkCache += "cmake.check_cache";
@@ -606,7 +606,7 @@ void cmGlobalXCodeGenerator::CreateReRunCMakeFile(
                  << " -H" << this->ConvertToRelativeForMake(
                    root->GetSourceDirectory())
                  << " -B" << this->ConvertToRelativeForMake(
-                   root->GetHomeOutputDirectory()) << "\n";
+                   root->GetBinaryDirectory()) << "\n";
 }
 
 //----------------------------------------------------------------------------
@@ -3748,7 +3748,7 @@ cmGlobalXCodeGenerator::OutputXCodeProject(cmLocalGenerator* root,
   // Since this call may have created new cache entries, save the cache:
   //
   root->GetMakefile()->GetCMakeInstance()->SaveCache(
-    root->GetHomeOutputDirectory());
+    root->GetBinaryDirectory());
 }
 
 //----------------------------------------------------------------------------

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a18b86b9c44ce4d669bf4719c2addf3f79628333
commit a18b86b9c44ce4d669bf4719c2addf3f79628333
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 7 21:32:34 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 7 21:32:34 2015 +0200

    fixup! cmLocalGenerator: Add current binary directory accessor.

diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index bfd426b..1d6b8b9 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -415,8 +415,9 @@ void cmGlobalXCodeGenerator::SetGenerationRoot(cmLocalGenerator* root)
   cmSystemTools::SplitPath(
         this->CurrentLocalGenerator->GetCurrentSourceDirectory(),
         this->ProjectSourceDirectoryComponents);
-  cmSystemTools::SplitPath(this->LocalGenerators->GetCurrentBinaryDirectory(),
-                           this->ProjectOutputDirectoryComponents);
+  cmSystemTools::SplitPath(
+        this->CurrentLocalGenerator->GetCurrentBinaryDirectory(),
+        this->ProjectOutputDirectoryComponents);
 
   this->CurrentXCodeHackMakefile =
     root->GetCurrentBinaryDirectory();

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

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


hooks/post-receive
-- 
CMake