|
@@ -776,7 +776,7 @@ public:
|
|
"Xcode does not support per-config per-source " << property << ":\n"
|
|
"Xcode does not support per-config per-source " << property << ":\n"
|
|
" " << expression << "\n"
|
|
" " << expression << "\n"
|
|
"specified for source:\n"
|
|
"specified for source:\n"
|
|
- " " << this->SourceFile->GetFullPath() << "\n";
|
|
|
|
|
|
+ " " << this->SourceFile->ResolveFullPath() << "\n";
|
|
/* clang-format on */
|
|
/* clang-format on */
|
|
this->LocalGenerator->IssueMessage(MessageType::FATAL_ERROR, e.str());
|
|
this->LocalGenerator->IssueMessage(MessageType::FATAL_ERROR, e.str());
|
|
}
|
|
}
|
|
@@ -850,7 +850,7 @@ cmXCodeObject* cmGlobalXCodeGenerator::CreateXCodeSourceFile(
|
|
lg->AppendFlags(flags, lg->GetIncludeFlags(includes, gtgt, lang, true));
|
|
lg->AppendFlags(flags, lg->GetIncludeFlags(includes, gtgt, lang, true));
|
|
|
|
|
|
cmXCodeObject* buildFile =
|
|
cmXCodeObject* buildFile =
|
|
- this->CreateXCodeSourceFileFromPath(sf->GetFullPath(), gtgt, lang, sf);
|
|
|
|
|
|
+ this->CreateXCodeSourceFileFromPath(sf->ResolveFullPath(), gtgt, lang, sf);
|
|
|
|
|
|
cmXCodeObject* settings = this->CreateObject(cmXCodeObject::ATTRIBUTE_GROUP);
|
|
cmXCodeObject* settings = this->CreateObject(cmXCodeObject::ATTRIBUTE_GROUP);
|
|
settings->AddAttributeIfNotEmpty("COMPILER_FLAGS",
|
|
settings->AddAttributeIfNotEmpty("COMPILER_FLAGS",
|
|
@@ -1030,7 +1030,7 @@ cmXCodeObject* cmGlobalXCodeGenerator::CreateXCodeFileReference(
|
|
{
|
|
{
|
|
std::string lang = this->CurrentLocalGenerator->GetSourceFileLanguage(*sf);
|
|
std::string lang = this->CurrentLocalGenerator->GetSourceFileLanguage(*sf);
|
|
|
|
|
|
- return this->CreateXCodeFileReferenceFromPath(sf->GetFullPath(), target,
|
|
|
|
|
|
+ return this->CreateXCodeFileReferenceFromPath(sf->ResolveFullPath(), target,
|
|
lang, sf);
|
|
lang, sf);
|
|
}
|
|
}
|
|
|
|
|
|
@@ -1065,7 +1065,7 @@ struct cmSourceFilePathCompare
|
|
{
|
|
{
|
|
bool operator()(cmSourceFile* l, cmSourceFile* r)
|
|
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");
|
|
"/CMakeLists.txt");
|
|
cmSourceFile* sf = gtgt->Makefile->GetOrCreateSource(
|
|
cmSourceFile* sf = gtgt->Makefile->GetOrCreateSource(
|
|
listfile, false, cmSourceFileLocationKind::Known);
|
|
listfile, false, cmSourceFileLocationKind::Known);
|
|
- addSourceToGroup(sf->GetFullPath());
|
|
|
|
|
|
+ addSourceToGroup(sf->ResolveFullPath());
|
|
}
|
|
}
|
|
|
|
|
|
// Add the Info.plist we are about to generate for an App Bundle.
|
|
// 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);
|
|
std::string plist = this->ComputeInfoPListLocation(gtgt);
|
|
cmSourceFile* sf = gtgt->Makefile->GetOrCreateSource(
|
|
cmSourceFile* sf = gtgt->Makefile->GetOrCreateSource(
|
|
plist, true, cmSourceFileLocationKind::Known);
|
|
plist, true, cmSourceFileLocationKind::Known);
|
|
- addSourceToGroup(sf->GetFullPath());
|
|
|
|
|
|
+ addSourceToGroup(sf->ResolveFullPath());
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|