diff options
| author | Brad King <brad.king@kitware.com> | 2013-04-11 14:22:44 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2013-04-11 14:23:33 (GMT) |
| commit | 87c0d16ab7e4128d81411db35ef05d4428b8c236 (patch) | |
| tree | 8b2e1b2f47db4f7e6ed2313fc6e118fb4e6bd8ab /Source/cmNinjaTargetGenerator.cxx | |
| parent | fb9f73de644539b4759ba67041d92fc418db0ee9 (diff) | |
| download | CMake-87c0d16ab7e4128d81411db35ef05d4428b8c236.zip CMake-87c0d16ab7e4128d81411db35ef05d4428b8c236.tar.gz CMake-87c0d16ab7e4128d81411db35ef05d4428b8c236.tar.bz2 | |
Ninja: Fix OBJECT_DIR placeholder path conversion
Transform the path using ConvertToNinjaPath just as we do for all other
paths. This fixes the OutOfSource test for objects in the ../OutOfBinary
directory by computing the proper full path for the /Fd option.
Diffstat (limited to 'Source/cmNinjaTargetGenerator.cxx')
| -rw-r--r-- | Source/cmNinjaTargetGenerator.cxx | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx index 3fb823c..850e5ea 100644 --- a/Source/cmNinjaTargetGenerator.cxx +++ b/Source/cmNinjaTargetGenerator.cxx @@ -569,11 +569,9 @@ cmNinjaTargetGenerator EnsureParentDirectoryExists(objectFileName); std::string objectDir = cmSystemTools::GetFilenamePath(objectFileName); - objectDir = this->GetLocalGenerator()->Convert(objectDir.c_str(), - cmLocalGenerator::START_OUTPUT, - cmLocalGenerator::SHELL); - vars["OBJECT_DIR"] = objectDir; - + vars["OBJECT_DIR"] = this->GetLocalGenerator()->ConvertToOutputFormat( + ConvertToNinjaPath(objectDir.c_str()).c_str(), + cmLocalGenerator::SHELL); this->SetMsvcTargetPdbVariable(vars); |