summaryrefslogtreecommitdiffstats
path: root/Source/cmGlobalXCodeGenerator.cxx
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2016-09-19 20:54:38 (GMT)
committerStephen Kelly <steveire@gmail.com>2016-10-06 16:45:18 (GMT)
commit8e0c1599a1015cf80c4db35d108509986236b756 (patch)
treea1019cd5da5310053dd48689ddc9da3563f35ed5 /Source/cmGlobalXCodeGenerator.cxx
parentb2cf1cba07633a242d5d13f694609a505c6a6235 (diff)
downloadCMake-8e0c1599a1015cf80c4db35d108509986236b756.zip
CMake-8e0c1599a1015cf80c4db35d108509986236b756.tar.gz
CMake-8e0c1599a1015cf80c4db35d108509986236b756.tar.bz2
Xcode: Inline ConvertToRelativePath calls
Avoid violations of Interface Segregation Principle. These two calls now simply call different methods.
Diffstat (limited to 'Source/cmGlobalXCodeGenerator.cxx')
-rw-r--r--Source/cmGlobalXCodeGenerator.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 4ff612d..75fc2e4 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -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)