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

BUG: fix non relative paths

This commit is contained in:
Bill Hoffman 2004-04-01 09:59:46 -05:00
parent e2ed5d1c64
commit 3e0817eb55
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/cmLocalUnixMakefileGenerator.cxx
View File

@ -1367,6 +1367,9 @@ void cmLocalUnixMakefileGenerator::OutputExecutableRule(std::ostream& fout,
target += name; target += name;
target += cmSystemTools::GetExecutableExtension(); target += cmSystemTools::GetExecutableExtension();
target = this->ConvertToRelativeOutputPath(target.c_str()); target = this->ConvertToRelativeOutputPath(target.c_str());
bool needsLocalTarget = false;
if(m_UseRelativePaths)
{
cmSystemTools::ConvertToUnixSlashes(target); cmSystemTools::ConvertToUnixSlashes(target);
bool needsLocalTarget = false; bool needsLocalTarget = false;
std::string tgt = this->ConvertToMakeTarget(target.c_str()); std::string tgt = this->ConvertToMakeTarget(target.c_str());
@ -1375,8 +1378,11 @@ void cmLocalUnixMakefileGenerator::OutputExecutableRule(std::ostream& fout,
needsLocalTarget = true; needsLocalTarget = true;
} }
target = cmSystemTools::ConvertToOutputPath(target.c_str()); target = cmSystemTools::ConvertToOutputPath(target.c_str());
}
else
{
needsLocalTarget = true;
}
std::string objs = "$(" + this->CreateMakeVariable(name, "_SRC_OBJS") + ") "; std::string objs = "$(" + this->CreateMakeVariable(name, "_SRC_OBJS") + ") ";
std::string depend = "$("; std::string depend = "$(";
depend += this->CreateMakeVariable(name, "_SRC_OBJS") depend += this->CreateMakeVariable(name, "_SRC_OBJS")