kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Ninja: Fix <OBJECT_DIR> substitution 

Don't forget the subdirectories.
This commit is contained in:
Peter Kuemmel 2012-03-18 13:40:01 +01:00 committed by Brad King
parent 572994bd9f
commit c337c7e205
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/cmNinjaNormalTargetGenerator.cxx
View File

@ -131,7 +131,10 @@ cmNinjaNormalTargetGenerator
vars.CMTarget = this->GetTarget(); vars.CMTarget = this->GetTarget();
vars.Language = this->TargetLinkLanguage; vars.Language = this->TargetLinkLanguage;
vars.Objects = "$in"; vars.Objects = "$in";
std::string objdir = cmake::GetCMakeFilesDirectoryPostSlash(); std::string objdir =
this->GetLocalGenerator()->GetHomeRelativeOutputPath();
objdir += objdir.empty() ? "" : "/";
objdir += cmake::GetCMakeFilesDirectoryPostSlash();
objdir += this->GetTargetName(); objdir += this->GetTargetName();
objdir += ".dir"; objdir += ".dir";
objdir = this->GetLocalGenerator()->Convert(objdir.c_str(), objdir = this->GetLocalGenerator()->Convert(objdir.c_str(),