diff options
| author | Brad King <brad.king@kitware.com> | 2007-03-07 21:32:29 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2007-03-07 21:32:29 (GMT) |
| commit | 073076e0f7785428f9a211dec76e4eaa304ad3b5 (patch) | |
| tree | e55ea34fa59ed2648d64a13f14104684c5db7c9a /Source/cmGlobalXCodeGenerator.cxx | |
| parent | f3cc908e42c912bb7ed0663763059a3820386776 (diff) | |
| download | CMake-073076e0f7785428f9a211dec76e4eaa304ad3b5.zip CMake-073076e0f7785428f9a211dec76e4eaa304ad3b5.tar.gz CMake-073076e0f7785428f9a211dec76e4eaa304ad3b5.tar.bz2 | |
COMP: Fix ConvertToRelativePath change for Xcode generator.
Diffstat (limited to 'Source/cmGlobalXCodeGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalXCodeGenerator.cxx | 6 |
1 files changed, 4 insertions, 2 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()); } } |