Xcode: Inline ConvertToRelativePath calls

Avoid violations of Interface Segregation Principle.  These two calls
now simply call different methods.
This commit is contained in:
Stephen Kelly 2016-09-19 22:54:38 +02:00
parent b2cf1cba07
commit 8e0c1599a1

View File

@ -3325,14 +3325,14 @@ std::string cmGlobalXCodeGenerator::RelativeToSource(const char* p)
{
// We force conversion because Xcode breakpoints do not work unless
// they are in a file named relative to the source tree.
return this->CurrentLocalGenerator->ConvertToRelativePath(
this->ProjectSourceDirectoryComponents, p, true);
return cmOutputConverter::ForceToRelativePath(
cmSystemTools::JoinPath(this->ProjectSourceDirectoryComponents), p);
}
std::string cmGlobalXCodeGenerator::RelativeToBinary(const char* p)
{
return this->CurrentLocalGenerator->ConvertToRelativePath(
this->ProjectOutputDirectoryComponents, p);
cmSystemTools::JoinPath(this->ProjectOutputDirectoryComponents), p);
}
std::string cmGlobalXCodeGenerator::XCodeEscapePath(const std::string& p)