diff options
| author | Brad King <brad.king@kitware.com> | 2010-09-16 19:07:41 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2010-09-16 19:07:41 (GMT) |
| commit | 2d9bb3325f6b1155bc7848f1f666e79c37bfa253 (patch) | |
| tree | a3aece578e5ad2daf19e4aeece568e57b9bc78e6 /Source/cmMakefileExecutableTargetGenerator.cxx | |
| parent | de7a090847b4e3113209cf518742cbc1988b3fd8 (diff) | |
| download | CMake-2d9bb3325f6b1155bc7848f1f666e79c37bfa253.zip CMake-2d9bb3325f6b1155bc7848f1f666e79c37bfa253.tar.gz CMake-2d9bb3325f6b1155bc7848f1f666e79c37bfa253.tar.bz2 | |
Evaluate <OBJECT_DIR> rule variable for executables
Previously this placeholder was evaluated only for libraries. Make it
work for executables too.
Diffstat (limited to 'Source/cmMakefileExecutableTargetGenerator.cxx')
| -rw-r--r-- | Source/cmMakefileExecutableTargetGenerator.cxx | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Source/cmMakefileExecutableTargetGenerator.cxx b/Source/cmMakefileExecutableTargetGenerator.cxx index 93c981a..a5e319d 100644 --- a/Source/cmMakefileExecutableTargetGenerator.cxx +++ b/Source/cmMakefileExecutableTargetGenerator.cxx @@ -345,6 +345,13 @@ void cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink) vars.CMTarget = this->Target; vars.Language = linkLanguage; vars.Objects = buildObjs.c_str(); + std::string objdir = cmake::GetCMakeFilesDirectoryPostSlash(); + objdir += this->Target->GetName(); + objdir += ".dir"; + objdir = this->Convert(objdir.c_str(), + cmLocalGenerator::START_OUTPUT, + cmLocalGenerator::SHELL); + vars.ObjectDir = objdir.c_str(); vars.Target = targetOutPathReal.c_str(); vars.TargetPDB = targetOutPathPDB.c_str(); |