[Cmake-commits] CMake branch, next, updated. v2.8.7-3241-g24dfb44

[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  24dfb445d2609f8b74a6d250ae1b7e58cf882818 (commit)
       via  8638645de1509b47b8e0718bb991ed38c6e0be89 (commit)
      from  6fe93f3f74f5b25968de2b17e8c54087cefb603e (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=24dfb445d2609f8b74a6d250ae1b7e58cf882818
commit 24dfb445d2609f8b74a6d250ae1b7e58cf882818
Merge: 6fe93f3 8638645
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Mar 19 09:38:05 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Mar 19 09:38:05 2012 -0400

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


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8638645de1509b47b8e0718bb991ed38c6e0be89
commit 8638645de1509b47b8e0718bb991ed38c6e0be89
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 09:32:21 2012 -0400

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

diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
index 9242181..d8749aa 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -131,7 +131,9 @@ 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:
 Source/cmNinjaNormalTargetGenerator.cxx |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake