diff options
| author | Brad King <brad.king@kitware.com> | 2014-01-02 19:23:52 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-01-02 19:23:52 (GMT) |
| commit | 7a63192074513a52283c2ae6f673bdab1bbcb3ad (patch) | |
| tree | d91e1cb2110a5159e49d3ffd2f2f23d0175d4590 /Source/cmNinjaTargetGenerator.cxx | |
| parent | fef56edee777b69716bd288d453c1263c0a291ef (diff) | |
| parent | 03f3b4e727d7d5f6c3ba4f0a64a2f440cff43a7d (diff) | |
| download | CMake-7a63192074513a52283c2ae6f673bdab1bbcb3ad.zip CMake-7a63192074513a52283c2ae6f673bdab1bbcb3ad.tar.gz CMake-7a63192074513a52283c2ae6f673bdab1bbcb3ad.tar.bz2 | |
Merge topic 'fix-compile-OBJECT_DIR'
03f3b4e Replace <OBJECT_DIR> rule placeholder consistently (#14667)
Diffstat (limited to 'Source/cmNinjaTargetGenerator.cxx')
| -rw-r--r-- | Source/cmNinjaTargetGenerator.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx index e3c058f..c8b03e1 100644 --- a/Source/cmNinjaTargetGenerator.cxx +++ b/Source/cmNinjaTargetGenerator.cxx @@ -568,7 +568,7 @@ cmNinjaTargetGenerator } EnsureParentDirectoryExists(objectFileName); - std::string objectDir = cmSystemTools::GetFilenamePath(objectFileName); + std::string objectDir = this->Target->GetSupportDirectory(); vars["OBJECT_DIR"] = this->GetLocalGenerator()->ConvertToOutputFormat( ConvertToNinjaPath(objectDir.c_str()).c_str(), cmLocalGenerator::SHELL); |