diff options
| author | Brad King <brad.king@kitware.com> | 2010-09-22 17:52:24 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2010-09-22 17:52:24 (GMT) |
| commit | 14d5ea7438d4da9aa8c50323418f4ad1c4facc9a (patch) | |
| tree | 1226ce58c31634003f32e3fa3bca817a818f69c7 /Source | |
| parent | a60241913cfd5e0d3005b2405b03aacd78c2ba99 (diff) | |
| parent | 5f05a3c25e1480648f46c9ccbf775225f9e8e32d (diff) | |
| download | CMake-14d5ea7438d4da9aa8c50323418f4ad1c4facc9a.zip CMake-14d5ea7438d4da9aa8c50323418f4ad1c4facc9a.tar.gz CMake-14d5ea7438d4da9aa8c50323418f4ad1c4facc9a.tar.bz2 | |
Merge topic 'mingw-long-object-lists'
5f05a3c MinGW: Support long object file lists
2d9bb33 Evaluate <OBJECT_DIR> rule variable for executables
Diffstat (limited to 'Source')
| -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(); |