mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-22 06:59:01 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'fix-compile-OBJECT_DIR'

Browse Source 
03f3b4e Replace <OBJECT_DIR> rule placeholder consistently (#14667)
This commit is contained in:
Brad King
2014-01-02 14:23:52 -05:00
committed by CMake Topic Stage
parent fef56edee7 03f3b4e727
commit 7a63192074
4 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Source/cmMakefileExecutableTargetGenerator.cxx
View File

@@ -338,13 +338,11 @@ 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();
std::string objectDir = this->Target->GetSupportDirectory();
objectDir = this->Convert(objectDir.c_str(),
cmLocalGenerator::START_OUTPUT,
cmLocalGenerator::SHELL);
vars.ObjectDir = objectDir.c_str();
vars.Target = targetOutPathReal.c_str();
vars.TargetPDB = targetOutPathPDB.c_str();