mirrors/cmake
2
0
Fork 0
mirror of https://gitlab.kitware.com/cmake/cmake.git synced 2026-09-25 04:09:36 +03:00
Code Activity

cmSourceGroup: Constify clients

Browse Source 
The generators do not need to modify the groups.
This commit is contained in:
Brad King
2026-05-01 10:43:32 -04:00
parent f513867bc4
commit ec06d16178
6 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/cmFileAPICodemodel.cxx
+6 -4
View File
@@ -487,7 +487,7 @@ class Target
void ProcessLanguages();
void ProcessLanguage(std::string const& lang);
Json::ArrayIndex AddSourceGroup(cmSourceGroup* sg);
Json::ArrayIndex AddSourceGroup(cmSourceGroup const* sg);
CompileData BuildCompileData(cmSourceFile* sf);
CompileData MergeCompileData(CompileData const& fd);
Json::ArrayIndex AddSourceCompileGroup(cmSourceFile* sf,
@@ -1477,7 +1477,7 @@ void Target::ProcessLanguage(std::string const& lang)
}
}
Json::ArrayIndex Target::AddSourceGroup(cmSourceGroup* sg)
Json::ArrayIndex Target::AddSourceGroup(cmSourceGroup const* sg)
{
auto i = this->SourceGroupsMap.find(sg);
if (i == this->SourceGroupsMap.end()) {
@@ -1829,7 +1829,8 @@ Json::Value Target::DumpSource(cmGeneratorTarget::SourceAndKind const& sk,
source["fileSetIndex"] = fsit->second;
}
if (cmSourceGroup* sg = this->GT->LocalGenerator->FindSourceGroup(path)) {
if (cmSourceGroup const* sg =
this->GT->LocalGenerator->FindSourceGroup(path)) {
Json::ArrayIndex const groupIndex = this->AddSourceGroup(sg);
source["sourceGroupIndex"] = groupIndex;
this->SourceGroups[groupIndex].SourceIndexes.append(si);
@@ -1913,7 +1914,8 @@ Json::Value Target::DumpInterfaceSource(std::string path, Json::ArrayIndex si,
source["fileSetIndex"] = fsit->second;
}
if (cmSourceGroup* sg = this->GT->LocalGenerator->FindSourceGroup(path)) {
if (cmSourceGroup const* sg =
this->GT->LocalGenerator->FindSourceGroup(path)) {
Json::ArrayIndex const groupIndex = this->AddSourceGroup(sg);
source["sourceGroupIndex"] = groupIndex;
this->SourceGroups[groupIndex].InterfaceSourceIndexes.append(si);
Source/cmGhsMultiTargetGenerator.cxx
+1 -1
View File
@@ -513,7 +513,7 @@ void cmGhsMultiTargetGenerator::WriteSources(std::ostream& fout_proj)
std::map<std::string, std::vector<cmSourceFile*>> groupFiles;
std::set<std::string> groupNames;
for (cmSourceFile* sf : sources) {
cmSourceGroup* sourceGroup =
cmSourceGroup const* sourceGroup =
this->LocalGenerator->FindSourceGroup(sf->ResolveFullPath());
std::string gn = sourceGroup->GetFullName();
groupFiles[gn].push_back(sf);
Source/cmGlobalVisualStudioGenerator.cxx
+1 -1
View File
@@ -1062,7 +1062,7 @@ cm::VS::Solution cmGlobalVisualStudioGenerator::CreateSolution(
item =
cmSystemTools::CollapseFullPath(item, mf->GetCurrentSourceDirectory());
}
cmSourceGroup* sg =
cmSourceGroup const* sg =
cmSourceGroup::FindSourceGroup(item, mf->GetSourceGroups());
std::string folderName = sg->GetFullName();
if (folderName.empty()) {
Source/cmGlobalXCodeGenerator.cxx
+2 -2
View File
@@ -4516,7 +4516,7 @@ bool cmGlobalXCodeGenerator::CreateGroups(
auto addSourceToGroup = [this, &gtgt,
&generator](std::string const& source) {
cmSourceGroup* sourceGroup = generator->FindSourceGroup(source);
cmSourceGroup const* sourceGroup = generator->FindSourceGroup(source);
cmXCodeObject* pbxgroup =
this->CreateOrGetPBXGroup(gtgt.get(), sourceGroup);
std::string key = GetGroupMapKeyFromPath(gtgt.get(), source);
@@ -4592,7 +4592,7 @@ cmXCodeObject* cmGlobalXCodeGenerator::CreatePBXGroup(cmXCodeObject* parent,
}
cmXCodeObject* cmGlobalXCodeGenerator::CreateOrGetPBXGroup(
cmGeneratorTarget* gtgt, cmSourceGroup* sg)
cmGeneratorTarget* gtgt, cmSourceGroup const* sg)
{
std::string s;
std::string target;
Source/cmGlobalXCodeGenerator.h
+1 -1
View File
@@ -161,7 +161,7 @@ private:
cm::string_view attributeValue);
cmXCodeObject* CreateOrGetPBXGroup(cmGeneratorTarget* gtgt,
cmSourceGroup* sg);
cmSourceGroup const* sg);
cmXCodeObject* CreatePBXGroup(cmXCodeObject* parent,
std::string const& name);
bool CreateGroups(std::vector<cmLocalGenerator*>& generators);
Source/cmVisualStudio10TargetGenerator.cxx
+7 -4
View File
@@ -2004,14 +2004,16 @@ void cmVisualStudio10TargetGenerator::WriteGroups()
std::set<cmSourceGroup const*> groupsUsed;
for (cmGeneratorTarget::AllConfigSource const& si : sources) {
std::string const& source = si.Source->GetFullPath();
cmSourceGroup* sourceGroup = this->LocalGenerator->FindSourceGroup(source);
cmSourceGroup const* sourceGroup =
this->LocalGenerator->FindSourceGroup(source);
groupsUsed.insert(sourceGroup);
}
if (cmSourceFile const* srcCMakeLists =
this->LocalGenerator->CreateVCProjBuildRule()) {
std::string const& source = srcCMakeLists->GetFullPath();
cmSourceGroup* sourceGroup = this->LocalGenerator->FindSourceGroup(source);
cmSourceGroup const* sourceGroup =
this->LocalGenerator->FindSourceGroup(source);
groupsUsed.insert(sourceGroup);
}
@@ -2170,7 +2172,8 @@ void cmVisualStudio10TargetGenerator::WriteGroupSources(
for (ToolSource const& s : sources) {
cmSourceFile const* sf = s.SourceFile;
std::string const& source = sf->GetFullPath();
cmSourceGroup* sourceGroup = this->LocalGenerator->FindSourceGroup(source);
cmSourceGroup const* sourceGroup =
this->LocalGenerator->FindSourceGroup(source);
std::string const& filter = sourceGroup->GetFullName();
std::string path = this->ConvertPath(source, s.RelativePath);
ConvertToWindowsSlash(path);
@@ -6031,7 +6034,7 @@ std::string cmVisualStudio10TargetGenerator::GetCSharpSourceLink(
std::string const& fullFileName = source->GetFullPath();
std::string const& srcDir = this->Makefile->GetCurrentSourceDirectory();
std::string const& binDir = this->Makefile->GetCurrentBinaryDirectory();
cmSourceGroup* sourceGroup =
cmSourceGroup const* sourceGroup =
this->LocalGenerator->FindSourceGroup(fullFileName);
if (sourceGroup && !sourceGroup->GetFullName().empty()) {
sourceGroupedFile =