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

ENH: fix java for ide builds again

This commit is contained in:
Bill Hoffman 2006-04-17 15:35:51 -04:00
parent 1e608c912c
commit 8fa5ed7300
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/cmLocalGenerator.cxx
View File

@ -458,6 +458,7 @@ void cmLocalGenerator::AddCustomCommandToCreateObject(const char* ofname,
cmTarget& ) cmTarget& )
{ {
std::string objectDir = cmSystemTools::GetFilenamePath(std::string(ofname)); std::string objectDir = cmSystemTools::GetFilenamePath(std::string(ofname));
objectDir = this->Convert(objectDir.c_str(),START_OUTPUT,SHELL);
std::string objectFile = this->Convert(ofname,START_OUTPUT,SHELL); std::string objectFile = this->Convert(ofname,START_OUTPUT,SHELL);
std::string sourceFile = std::string sourceFile =
this->Convert(source.GetFullPath().c_str(),START_OUTPUT,SHELL,true); this->Convert(source.GetFullPath().c_str(),START_OUTPUT,SHELL,true);
@ -570,10 +571,7 @@ void cmLocalGenerator::AddBuildTargetRule(const char* llang, cmTarget& target)
cmLocalGenerator::RuleVariables vars; cmLocalGenerator::RuleVariables vars;
vars.Language = llang; vars.Language = llang;
vars.Objects = objs.c_str(); vars.Objects = objs.c_str();
std::string objdir = "CMakeFiles/"; vars.ObjectDir = ".";
objdir += targetName;
objdir += ".dir";
vars.ObjectDir = objdir.c_str();
vars.Target = targetName.c_str(); vars.Target = targetName.c_str();
vars.LinkLibraries = linkLibs.c_str(); vars.LinkLibraries = linkLibs.c_str();
vars.Flags = flags.c_str(); vars.Flags = flags.c_str();