Merge topic 'ninja-generator'

c337c7e2 Ninja: Fix <OBJECT_DIR> substitution

Source/cmNinjaNormalTargetGenerator.cxx

@@ -141,7 +141,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(),