Commit 20f56a7e authored by David Cole's avatar David Cole Committed by Kitware Robot

Merge topic 'EclipseFixBadLinkedResources'

4ea5dc5b Eclipse: fix #13358: don't create bad linked resources
parents 1b968456 4ea5dc5b
......@@ -1334,12 +1334,26 @@ bool cmExtraEclipseCDT4Generator
{
outputPath = this->HomeOutputDirectory + "/" + outputPath;
}
// in this case it's not necessary:
if (cmSystemTools::IsSubDirectory(outputPath.c_str(),
this->HomeOutputDirectory.c_str()))
{
return false;
}
// in these two cases Eclipse would complain:
if (cmSystemTools::IsSubDirectory(this->HomeOutputDirectory.c_str(),
outputPath.c_str()))
{
return false;
}
if (cmSystemTools::GetRealPath(outputPath.c_str())
== cmSystemTools::GetRealPath(this->HomeOutputDirectory.c_str()))
{
return false;
}
std::string name = this->GetPathBasename(outputPath);
// make sure linked resource name is unique
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment