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

BUG: make sure OBJECT_DIR is in the path of the SHELL

This commit is contained in:
Bill Hoffman 2008-04-11 13:13:15 -04:00
parent 8350a17101
commit b0256fbe1c
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/cmMakefileLibraryTargetGenerator.cxx
View File

@ -724,7 +724,10 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
std::string objdir = cmake::GetCMakeFilesDirectoryPostSlash(); std::string objdir = cmake::GetCMakeFilesDirectoryPostSlash();
objdir += this->Target->GetName(); objdir += this->Target->GetName();
objdir += ".dir"; objdir += ".dir";
vars.ObjectDir = objdir.c_str(); 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();
std::string linkString = linklibs.str(); std::string linkString = linklibs.str();
vars.LinkLibraries = linkString.c_str(); vars.LinkLibraries = linkString.c_str();

3
Source/cmMakefileTargetGenerator.cxx
View File

@ -614,6 +614,9 @@ cmMakefileTargetGenerator
cmLocalGenerator::SHELL).c_str(); cmLocalGenerator::SHELL).c_str();
vars.Object = shellObj.c_str(); vars.Object = shellObj.c_str();
std::string objectDir = cmSystemTools::GetFilenamePath(obj); std::string objectDir = cmSystemTools::GetFilenamePath(obj);
objectDir = this->Convert(objectDir.c_str(),
cmLocalGenerator::START_OUTPUT,
cmLocalGenerator::SHELL);
vars.ObjectDir = objectDir.c_str(); vars.ObjectDir = objectDir.c_str();
vars.Flags = flags.c_str(); vars.Flags = flags.c_str();
vars.Defines = defines.c_str(); vars.Defines = defines.c_str();