[Cmake-commits] CMake branch, next, updated. v2.8.6-2176-ga5b213a

[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  a5b213a704b73e776b0f5a17d00e01cec1ebd224 (commit)
       via  e8b8f0eda8f5d757582310a9f5d58c90d7074e3f (commit)
      from  de2bbba316ad3b207d906a670ce8ce8d4e0b9c14 (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=a5b213a704b73e776b0f5a17d00e01cec1ebd224
commit a5b213a704b73e776b0f5a17d00e01cec1ebd224
Merge: de2bbba e8b8f0e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Dec 9 13:02:04 2011 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Dec 9 13:02:04 2011 -0500

    Merge topic 'xcode-rerun-issue-12616' into next
    
    e8b8f0e Xcode: Create separate rerun dependencies for subprojects (#12616)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e8b8f0eda8f5d757582310a9f5d58c90d7074e3f
commit e8b8f0eda8f5d757582310a9f5d58c90d7074e3f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Dec 9 12:43:06 2011 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Dec 9 13:00:22 2011 -0500

    Xcode: Create separate rerun dependencies for subprojects (#12616)
    
    Generate the rerun dependency file for the top-level project() and each
    subdirectory project() into the corresponding build directory.  Do not
    clobber them all with the one for the last subproject.  This mistake was
    left from when the Xcode generator did not produce subprojects.

diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 32eaef8..859503f 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -458,8 +458,7 @@ void cmGlobalXCodeGenerator::CreateReRunCMakeFile(
   std::vector<std::string>::iterator new_end =
     std::unique(lfiles.begin(), lfiles.end());
   lfiles.erase(new_end, lfiles.end());
-  std::string dir = mf->GetHomeOutputDirectory();
-  this->CurrentReRunCMakeMakefile = dir;
+  this->CurrentReRunCMakeMakefile = mf->GetStartOutputDirectory();
   this->CurrentReRunCMakeMakefile += "/CMakeScripts";
   cmSystemTools::MakeDirectory(this->CurrentReRunCMakeMakefile.c_str());
   this->CurrentReRunCMakeMakefile += "/ReRunCMake.make";

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

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


hooks/post-receive
-- 
CMake