diff options
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmGlobalXCodeGenerator.cxx | 6 | ||||
| -rw-r--r-- | Source/cmLocalGenerator.h | 20 |
2 files changed, 14 insertions, 12 deletions
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx index e87fb22..fdcc12f 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx @@ -2539,7 +2539,8 @@ std::string cmGlobalXCodeGenerator::ConvertToRelativeForMake(const char* p) else { std::string ret = - this->ConvertToRelativePath(this->CurrentOutputDirectoryComponents, p); + this->CurrentLocalGenerator-> + ConvertToRelativePath(this->CurrentOutputDirectoryComponents, p); return cmSystemTools::ConvertToOutputPath(ret.c_str()); } } @@ -2554,7 +2555,8 @@ std::string cmGlobalXCodeGenerator::ConvertToRelativeForXCode(const char* p) else { std::string ret = - this->ConvertToRelativePath(this->ProjectOutputDirectoryComponents, p); + this->CurrentLocalGenerator-> + ConvertToRelativePath(this->ProjectOutputDirectoryComponents, p); return cmSystemTools::ConvertToOutputPath(ret.c_str()); } } diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h index 6b4d7dc..53a53d4 100644 --- a/Source/cmLocalGenerator.h +++ b/Source/cmLocalGenerator.h @@ -219,6 +219,16 @@ public: // return the source name for the object file virtual std::string GetSourceObjectName(cmSourceFile& ); + /** + * Convert the given remote path to a relative path with respect to + * the given local path. The local path must be given in component + * form (see SystemTools::SplitPath) without a trailing slash. The + * remote path must use forward slashes and not already be escaped + * or quoted. + */ + std::string ConvertToRelativePath(const std::vector<std::string>& local, + const char* remote); + protected: /** Construct a comment for a custom command. */ @@ -268,16 +278,6 @@ protected: void ConfigureRelativePaths(); - /** - * Convert the given remote path to a relative path with respect to - * the given local path. The local path must be given in component - * form (see SystemTools::SplitPath) without a trailing slash. The - * remote path must use forward slashes and not already be escaped - * or quoted. - */ - std::string ConvertToRelativePath(const std::vector<std::string>& local, - const char* remote); - cmMakefile *Makefile; cmGlobalGenerator *GlobalGenerator; // members used for relative path function ConvertToMakefilePath |