kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Evaluate <OBJECT_DIR> rule variable for executables

Browse Source 
Previously this placeholder was evaluated only for libraries.  Make it
work for executables too.
This commit is contained in:
Brad King 2010-09-16 15:07:41 -04:00
parent de7a090847
commit 2d9bb3325f
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Source/cmMakefileExecutableTargetGenerator.cxx
View File

@ -345,6 +345,13 @@ void cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink)
vars.CMTarget = this->Target; vars.CMTarget = this->Target;
vars.Language = linkLanguage; vars.Language = linkLanguage;
vars.Objects = buildObjs.c_str(); 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.Target = targetOutPathReal.c_str();
vars.TargetPDB = targetOutPathPDB.c_str(); vars.TargetPDB = targetOutPathPDB.c_str();