summaryrefslogtreecommitdiffstats
path: root/Source/cmGlobalXCodeGenerator.cxx
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2015-04-16 19:17:41 (GMT)
committerStephen Kelly <steveire@gmail.com>2015-04-20 22:12:52 (GMT)
commit55d80d0a8557189400bc12c5e577702a4d03b2e6 (patch)
treef19e6c57f469cc0ded33f382b0bee47369265c13 /Source/cmGlobalXCodeGenerator.cxx
parentb23cf06f861e928cf8ee942eabd24ea76e299f4f (diff)
downloadCMake-55d80d0a8557189400bc12c5e577702a4d03b2e6.zip
CMake-55d80d0a8557189400bc12c5e577702a4d03b2e6.tar.gz
CMake-55d80d0a8557189400bc12c5e577702a4d03b2e6.tar.bz2
cmMakefile: Rename GetCurrent{,Source}Directory.
Match the names used in cmake code.
Diffstat (limited to 'Source/cmGlobalXCodeGenerator.cxx')
-rw-r--r--Source/cmGlobalXCodeGenerator.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 8c37338..c8e7632 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -407,7 +407,7 @@ void cmGlobalXCodeGenerator::SetGenerationRoot(cmLocalGenerator* root)
{
this->CurrentProject = root->GetMakefile()->GetProjectName();
this->SetCurrentLocalGenerator(root);
- cmSystemTools::SplitPath(this->CurrentMakefile->GetCurrentDirectory(),
+ cmSystemTools::SplitPath(this->CurrentMakefile->GetCurrentSourceDirectory(),
this->ProjectSourceDirectoryComponents);
cmSystemTools::SplitPath(this->CurrentMakefile->GetCurrentOutputDirectory(),
this->ProjectOutputDirectoryComponents);
@@ -3342,7 +3342,7 @@ bool cmGlobalXCodeGenerator
// Point Xcode at the top of the source tree.
{
std::string pdir =
- this->RelativeToBinary(root->GetMakefile()->GetCurrentDirectory());
+ this->RelativeToBinary(root->GetMakefile()->GetCurrentSourceDirectory());
this->RootObject->AddAttribute("projectDirPath",
this->CreateString(pdir.c_str()));
this->RootObject->AddAttribute("projectRoot", this->CreateString(""));