diff options
author | Brad King <brad.king@kitware.com> | 2019-11-05 19:20:21 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2019-11-05 19:29:41 (GMT) |
commit | 0ce8a5c08de0852f22f9be595c6f08a4a6c865e9 (patch) | |
tree | d68254fe6b9eae188dcc336bafd0ca9d521204ba /Source/cmGlobalXCodeGenerator.cxx | |
parent | 9457c95aa033aa192b0fbe2796e3a660a660d0ad (diff) | |
download | CMake-0ce8a5c08de0852f22f9be595c6f08a4a6c865e9.zip CMake-0ce8a5c08de0852f22f9be595c6f08a4a6c865e9.tar.gz CMake-0ce8a5c08de0852f22f9be595c6f08a4a6c865e9.tar.bz2 |
Xcode: Fix generated references to CMakeLists.txt files
Refactoring in commit 2d888e3390 (cmSourceFile: Rename mutating
GetFullPath() overload, 2019-08-29, v3.16.0-rc1~160^2) accidentally left
the paths to `CMakeLists.txt` files empty in generated Xcode project
files.
Fixes: #19927
Diffstat (limited to 'Source/cmGlobalXCodeGenerator.cxx')
-rw-r--r-- | Source/cmGlobalXCodeGenerator.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx index cb3ee54..adeb065 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx @@ -776,7 +776,7 @@ public: "Xcode does not support per-config per-source " << property << ":\n" " " << expression << "\n" "specified for source:\n" - " " << this->SourceFile->GetFullPath() << "\n"; + " " << this->SourceFile->ResolveFullPath() << "\n"; /* clang-format on */ this->LocalGenerator->IssueMessage(MessageType::FATAL_ERROR, e.str()); } @@ -850,7 +850,7 @@ cmXCodeObject* cmGlobalXCodeGenerator::CreateXCodeSourceFile( lg->AppendFlags(flags, lg->GetIncludeFlags(includes, gtgt, lang, true)); cmXCodeObject* buildFile = - this->CreateXCodeSourceFileFromPath(sf->GetFullPath(), gtgt, lang, sf); + this->CreateXCodeSourceFileFromPath(sf->ResolveFullPath(), gtgt, lang, sf); cmXCodeObject* settings = this->CreateObject(cmXCodeObject::ATTRIBUTE_GROUP); settings->AddAttributeIfNotEmpty("COMPILER_FLAGS", @@ -1030,7 +1030,7 @@ cmXCodeObject* cmGlobalXCodeGenerator::CreateXCodeFileReference( { std::string lang = this->CurrentLocalGenerator->GetSourceFileLanguage(*sf); - return this->CreateXCodeFileReferenceFromPath(sf->GetFullPath(), target, + return this->CreateXCodeFileReferenceFromPath(sf->ResolveFullPath(), target, lang, sf); } @@ -1065,7 +1065,7 @@ struct cmSourceFilePathCompare { bool operator()(cmSourceFile* l, cmSourceFile* r) { - return l->GetFullPath() < r->GetFullPath(); + return l->ResolveFullPath() < r->ResolveFullPath(); } }; @@ -2859,7 +2859,7 @@ bool cmGlobalXCodeGenerator::CreateGroups( "/CMakeLists.txt"); cmSourceFile* sf = gtgt->Makefile->GetOrCreateSource( listfile, false, cmSourceFileLocationKind::Known); - addSourceToGroup(sf->GetFullPath()); + addSourceToGroup(sf->ResolveFullPath()); } // Add the Info.plist we are about to generate for an App Bundle. @@ -2867,7 +2867,7 @@ bool cmGlobalXCodeGenerator::CreateGroups( std::string plist = this->ComputeInfoPListLocation(gtgt); cmSourceFile* sf = gtgt->Makefile->GetOrCreateSource( plist, true, cmSourceFileLocationKind::Known); - addSourceToGroup(sf->GetFullPath()); + addSourceToGroup(sf->ResolveFullPath()); } } } |