diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2006-04-17 19:35:51 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2006-04-17 19:35:51 (GMT) |
| commit | 8fa5ed7300f665c2ae100732d23224482fa4a079 (patch) | |
| tree | f932009e33e201c3ab070eaef5b8dcce297249a7 | |
| parent | 1e608c912cf5f5f61f7fd8d66000549aa9621b88 (diff) | |
| download | CMake-8fa5ed7300f665c2ae100732d23224482fa4a079.zip CMake-8fa5ed7300f665c2ae100732d23224482fa4a079.tar.gz CMake-8fa5ed7300f665c2ae100732d23224482fa4a079.tar.bz2 | |
ENH: fix java for ide builds again
| -rw-r--r-- | Source/cmLocalGenerator.cxx | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index 36a5ecc..765e720 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -458,6 +458,7 @@ void cmLocalGenerator::AddCustomCommandToCreateObject(const char* ofname, cmTarget& ) { 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 sourceFile = 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; vars.Language = llang; vars.Objects = objs.c_str(); - std::string objdir = "CMakeFiles/"; - objdir += targetName; - objdir += ".dir"; - vars.ObjectDir = objdir.c_str(); + vars.ObjectDir = "."; vars.Target = targetName.c_str(); vars.LinkLibraries = linkLibs.c_str(); vars.Flags = flags.c_str(); |