diff options
| author | Peter Kuemmel <syntheticpp@gmx.net> | 2012-03-18 12:40:01 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2012-03-19 14:09:40 (GMT) |
| commit | c337c7e205259d5944b19c2a6d2007f490379ddc (patch) | |
| tree | 3f9510a803609142ed89a503d8b33a7ecc48c664 | |
| parent | 572994bd9f8ea77c3101f0b019b693c37b0d502e (diff) | |
| download | CMake-c337c7e205259d5944b19c2a6d2007f490379ddc.zip CMake-c337c7e205259d5944b19c2a6d2007f490379ddc.tar.gz CMake-c337c7e205259d5944b19c2a6d2007f490379ddc.tar.bz2 | |
Ninja: Fix <OBJECT_DIR> substitution
Don't forget the subdirectories.
| -rw-r--r-- | Source/cmNinjaNormalTargetGenerator.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
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(), |