diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2006-04-17 18:01:22 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2006-04-17 18:01:22 (GMT) |
| commit | 5ecfd3d4d332e616605a75a273921b01437cb08f (patch) | |
| tree | 9deb4e3debb729a631251a2935fc77fc3f9e4f59 /Source/cmMakefileTargetGenerator.cxx | |
| parent | 0f8603acc2f007e68a1c41a48919fd1acfc41c20 (diff) | |
| download | CMake-5ecfd3d4d332e616605a75a273921b01437cb08f.zip CMake-5ecfd3d4d332e616605a75a273921b01437cb08f.tar.gz CMake-5ecfd3d4d332e616605a75a273921b01437cb08f.tar.bz2 | |
ENH: fix java and add OBJECT_DIR support
Diffstat (limited to 'Source/cmMakefileTargetGenerator.cxx')
| -rw-r--r-- | Source/cmMakefileTargetGenerator.cxx | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx index 249db05..aca3d29 100644 --- a/Source/cmMakefileTargetGenerator.cxx +++ b/Source/cmMakefileTargetGenerator.cxx @@ -389,6 +389,12 @@ cmMakefileTargetGenerator vars.Language = lang; vars.Source = sourceFile.c_str(); vars.Object = relativeObj.c_str(); + std::string objdir = this->LocalGenerator->GetHomeRelativeOutputPath(); + objdir = this->Convert(objdir.c_str(), + cmLocalGenerator::START_OUTPUT, + cmLocalGenerator::SHELL); + std::string objectDir = cmSystemTools::GetFilenamePath(obj); + vars.ObjectDir = objectDir.c_str(); vars.Flags = flags.c_str(); // Expand placeholders in the commands. |