Ninja: Fix <OBJECT_DIR> substitution

Don't forget the subdirectories.

Ninja: Fix <OBJECT_DIR> substitution
Don't forget the subdirectories.
c337c7e2 · Peter Kuemmel · Brad King · 572994bd · c337c7e2
Commit c337c7e2 authored Mar 18, 2012 by Peter Kuemmel Committed by Brad King Mar 19, 2012
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

Source/cmNinjaNormalTargetGenerator.cxx Source/cmNinjaNormalTargetGenerator.cxx +4 -1

No files found.
--- 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(),