mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-04 12:49:36 -06:00
Code Issues Packages Projects Releases Wiki Activity

fileapi: Refactor codemodel defines de-duplication

Browse Source
This commit is contained in:
Brad King
2019-07-29 10:06:18 -04:00
parent c9c397a14a
commit 833d9eae4e
1 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
Source/cmFileAPICodemodel.cxx
View File

@@ -231,8 +231,6 @@ struct CompileData
}
};
void SetDefines(std::set<BT<std::string>> const& defines);
std::string Language;
std::string Sysroot;
std::vector<BT<std::string>> Flags;
@@ -240,14 +238,6 @@ struct CompileData
std::vector<IncludeEntry> Includes;
};
void CompileData::SetDefines(std::set<BT<std::string>> const& defines)
{
this->Defines.reserve(defines.size());
for (BT<std::string> const& d : defines) {
this->Defines.push_back(d);
}
}
class Target
{
cmGeneratorTarget* GT;
@@ -726,7 +716,10 @@ void Target::ProcessLanguage(std::string const& lang)
}
std::set<BT<std::string>> defines =
lg->GetTargetDefines(this->GT, this->Config, lang);
cd.SetDefines(defines);
cd.Defines.reserve(defines.size());
for (BT<std::string> const& d : defines) {
cd.Defines.emplace_back(d);
}
std::vector<BT<std::string>> includePathList =
lg->GetIncludeDirectories(this->GT, lang, this->Config);
for (BT<std::string> const& i : includePathList) {
@@ -814,11 +807,16 @@ CompileData Target::BuildCompileData(cmSourceFile* sf)
genexInterpreter.Evaluate(config_defs, COMPILE_DEFINITIONS));
}
std::set<BT<std::string>> defines;
defines.insert(fileDefines.begin(), fileDefines.end());
defines.insert(cd.Defines.begin(), cd.Defines.end());
fd.Defines.reserve(cd.Defines.size() + fileDefines.size());
fd.Defines = cd.Defines;
for (std::string const& d : fileDefines) {
fd.Defines.emplace_back(d, cmListFileBacktrace());
}
fd.SetDefines(defines);
// De-duplicate defines.
std::stable_sort(fd.Defines.begin(), fd.Defines.end());
auto end = std::unique(fd.Defines.begin(), fd.Defines.end());
fd.Defines.erase(end, fd.Defines.end());
return fd;
}