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

18
Source/cmLocalUnixMakefileGenerator.cxx
View File

@ -1367,16 +1367,22 @@ void cmLocalUnixMakefileGenerator::OutputExecutableRule(std::ostream& fout,
target += name;
target += cmSystemTools::GetExecutableExtension();
target = this->ConvertToRelativeOutputPath(target.c_str());
cmSystemTools::ConvertToUnixSlashes(target);
bool needsLocalTarget = false;
std::string tgt = this->ConvertToMakeTarget(target.c_str());
if(tgt.find('/', 0) != tgt.npos)
if(m_UseRelativePaths)
{
cmSystemTools::ConvertToUnixSlashes(target);
bool needsLocalTarget = false;
std::string tgt = this->ConvertToMakeTarget(target.c_str());
if(tgt.find('/', 0) != tgt.npos)
{
needsLocalTarget = true;
}
target = cmSystemTools::ConvertToOutputPath(target.c_str());
}
else
{
needsLocalTarget = true;
}
target = cmSystemTools::ConvertToOutputPath(target.c_str());
std::string objs = "$(" + this->CreateMakeVariable(name, "_SRC_OBJS") + ") ";
std::string depend = "$(";
depend += this->CreateMakeVariable(name, "_SRC_OBJS")