[Cmake-commits] CMake branch, next, updated. v2.8.7-3245-g9727a6d

[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  9727a6ddc82367df2f40946915d991f26d1839d4 (commit)
       via  c337c7e205259d5944b19c2a6d2007f490379ddc (commit)
      from  72fd7358d2dc1af465d963d681e4814a1b0f7dea (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=9727a6ddc82367df2f40946915d991f26d1839d4
commit 9727a6ddc82367df2f40946915d991f26d1839d4
Merge: 72fd735 c337c7e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Mar 19 10:09:51 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Mar 19 10:09:51 2012 -0400

    Merge topic 'ninja-generator' into next
    
    c337c7e Ninja: Fix <OBJECT_DIR> substitution


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c337c7e205259d5944b19c2a6d2007f490379ddc
commit c337c7e205259d5944b19c2a6d2007f490379ddc
Author:     Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Sun Mar 18 13:40:01 2012 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Mar 19 10:09:40 2012 -0400

    Ninja: Fix <OBJECT_DIR> substitution
    
    Don't forget the subdirectories.

diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
index 9242181..35f3baf 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -131,7 +131,10 @@ cmNinjaNormalTargetGenerator
     vars.CMTarget = this->GetTarget();
     vars.Language = this->TargetLinkLanguage;
     vars.Objects = "$in";
-    std::string objdir = cmake::GetCMakeFilesDirectoryPostSlash();
+    std::string objdir =
+      this->GetLocalGenerator()->GetHomeRelativeOutputPath();
+    objdir += objdir.empty() ? "" : "/";
+    objdir += cmake::GetCMakeFilesDirectoryPostSlash();
     objdir += this->GetTargetName();
     objdir += ".dir";
     objdir = this->GetLocalGenerator()->Convert(objdir.c_str(),

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

Summary of changes:


hooks/post-receive
-- 
CMake