[Cmake-commits] CMake branch, next, updated. v2.8.9-1211-ged8aca6

[Brad King]

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  ed8aca6e5363fd9c5a3a486673d37fd6f51db09a (commit)
       via  388a3216fc9d22531b40963a81d70900c602c7fc (commit)
      from  634a43bebcb8941d2812fa4abffaa93bddecf6c8 (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=ed8aca6e5363fd9c5a3a486673d37fd6f51db09a
commit ed8aca6e5363fd9c5a3a486673d37fd6f51db09a
Merge: 634a43b 388a321
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 25 15:16:27 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 25 15:16:27 2012 -0400

    Merge topic 'xcode-ReRunCMake-full-path' into next
    
    388a321 Xcode: Fix ReRunCMake.make path to cmake.check_cache (#13603)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=388a3216fc9d22531b40963a81d70900c602c7fc
commit 388a3216fc9d22531b40963a81d70900c602c7fc
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 24 13:33:46 2012 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Oct 24 14:13:19 2012 -0400

    Xcode: Fix ReRunCMake.make path to cmake.check_cache (#13603)
    
    The path must be either absolute or relative to the working directory
    from which the makefile will be loaded.  In subprojects this is not
    relative to the top of the build tree.
    
    Reported-by: David Weese <tre at gmx.de>

diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 30d8f18..5b2ddd8 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -495,8 +495,12 @@ void cmGlobalXCodeGenerator::CreateReRunCMakeFile(
     (this->CurrentReRunCMakeMakefile.c_str());
   makefileStream.SetCopyIfDifferent(true);
   makefileStream << "# Generated by CMake, DO NOT EDIT\n";
-  makefileStream << cmake::GetCMakeFilesDirectoryPostSlash();
-  makefileStream << "cmake.check_cache: ";
+  std::string checkCache = mf->GetHomeOutputDirectory();
+  checkCache += "/";
+  checkCache += cmake::GetCMakeFilesDirectoryPostSlash();
+  checkCache += "cmake.check_cache";
+  makefileStream << this->ConvertToRelativeForMake(checkCache.c_str())
+                 << ": ";
   for(std::vector<std::string>::const_iterator i = lfiles.begin();
       i !=  lfiles.end(); ++i)
     {

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

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


hooks/post-receive
-- 
CMake