diff options
| author | Gregor Jasny <gjasny@googlemail.com> | 2017-02-24 16:31:24 (GMT) |
|---|---|---|
| committer | Gregor Jasny <gjasny@googlemail.com> | 2017-02-28 21:38:29 (GMT) |
| commit | 7202db5db46bfe7499244af315249820e883c8cf (patch) | |
| tree | 319c16d7693ec22fc0af46337c0610bcc30a4f38 /Source/cmGlobalXCodeGenerator.cxx | |
| parent | 5995082101a1959f303f9f3d6c0a1e483630749e (diff) | |
| download | CMake-7202db5db46bfe7499244af315249820e883c8cf.zip CMake-7202db5db46bfe7499244af315249820e883c8cf.tar.gz CMake-7202db5db46bfe7499244af315249820e883c8cf.tar.bz2 | |
Xcode: Fix schema container location calculation
Diffstat (limited to 'Source/cmGlobalXCodeGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalXCodeGenerator.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx index f0ebf88..b023d5c 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx @@ -3344,7 +3344,7 @@ void cmGlobalXCodeGenerator::OutputXCodeProject( if (this->GetCMakeInstance()->GetState()->GetGlobalPropertyAsBool( "XCODE_GENERATE_SCHEME") && this->XcodeVersion >= 70) { - this->OutputXCodeSharedSchemes(xcodeDir, root); + this->OutputXCodeSharedSchemes(xcodeDir); this->OutputXCodeWorkspaceSettings(xcodeDir); } @@ -3357,7 +3357,7 @@ void cmGlobalXCodeGenerator::OutputXCodeProject( } void cmGlobalXCodeGenerator::OutputXCodeSharedSchemes( - const std::string& xcProjDir, cmLocalGenerator* root) + const std::string& xcProjDir) { for (std::vector<cmXCodeObject*>::const_iterator i = this->XCodeObjects.begin(); @@ -3369,7 +3369,7 @@ void cmGlobalXCodeGenerator::OutputXCodeSharedSchemes( cmXCodeScheme schm(obj, this->CurrentConfigurationTypes, this->XcodeVersion); schm.WriteXCodeSharedScheme(xcProjDir, - root->GetCurrentSourceDirectory()); + this->RelativeToSource(xcProjDir.c_str())); } } } |