kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

COMP: Fix ConvertToRelativePath change for Xcode generator.

This commit is contained in:
Brad King 2007-03-07 16:32:29 -05:00
parent f3cc908e42
commit 073076e0f7
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/cmGlobalXCodeGenerator.cxx
View File

@ -2539,7 +2539,8 @@ std::string cmGlobalXCodeGenerator::ConvertToRelativeForMake(const char* p)
else else
{ {
std::string ret = std::string ret =
this->ConvertToRelativePath(this->CurrentOutputDirectoryComponents, p); this->CurrentLocalGenerator->
ConvertToRelativePath(this->CurrentOutputDirectoryComponents, p);
return cmSystemTools::ConvertToOutputPath(ret.c_str()); return cmSystemTools::ConvertToOutputPath(ret.c_str());
} }
} }
@ -2554,7 +2555,8 @@ std::string cmGlobalXCodeGenerator::ConvertToRelativeForXCode(const char* p)
else else
{ {
std::string ret = std::string ret =
this->ConvertToRelativePath(this->ProjectOutputDirectoryComponents, p); this->CurrentLocalGenerator->
ConvertToRelativePath(this->ProjectOutputDirectoryComponents, p);
return cmSystemTools::ConvertToOutputPath(ret.c_str()); return cmSystemTools::ConvertToOutputPath(ret.c_str());
} }
} }

20
Source/cmLocalGenerator.h
View File

@ -219,6 +219,16 @@ public:
// return the source name for the object file // return the source name for the object file
virtual std::string GetSourceObjectName(cmSourceFile& ); 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: protected:
/** Construct a comment for a custom command. */ /** Construct a comment for a custom command. */
@ -268,16 +278,6 @@ protected:
void ConfigureRelativePaths(); 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; cmMakefile *Makefile;
cmGlobalGenerator *GlobalGenerator; cmGlobalGenerator *GlobalGenerator;
// members used for relative path function ConvertToMakefilePath // members used for relative path function ConvertToMakefilePath