github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-05-15 14:16:07 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

ide: Include path is now only containing used nests

Browse source
This commit is contained in:
Mirek Fidler 2025-02-28 12:28:27 +01:00
parent daa6ab71b8
commit ef958c0fae
1 changed files with 15 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

19
uppsrc/ide/Builders/Build.cpp
View file

@ -20,8 +20,8 @@ const TargetMode& MakeBuild::GetTargetMode()
}
Index<String> MakeBuild::PackageConfig(const Workspace& wspc, int package,
const VectorMap<String, String>& bm, String mainparam,
Host& host, Builder& b, String *target)
const VectorMap<String, String>& bm, String mainparam,
Host& host, Builder& b, String *target)
{
String packagepath = PackagePath(wspc[package]);
const Package& pkg = wspc.package[package];
@ -204,10 +204,21 @@ One<Builder> MakeBuild::CreateBuilder(Host *host)
b = pAb;
}
else {
// TODO: cpp builder variables only!!!
b->compiler = bm.Get("COMPILER", "");
b->include = SplitDirs(Join(GetUppDirs(), ";") + ';' + bm.Get("INCLUDE", "") + ';' + add_includes);
Vector<String> nests = GetUppDirs();
for(String& p : nests)
p = NormalizePath(p);
Index<String> used_nests; // only add nests that are used to prevent UppHub problems
const Workspace& wspc = GetIdeWorkspace();
for(int i = 0; i < wspc.GetCount(); i++) {
String pp = NormalizePath(PackagePath(wspc[i]));
for(String n : nests)
if(pp.StartsWith(n)) {
used_nests.FindAdd(n);
break;
}
}
b->include = SplitDirs(Join(used_nests.GetKeys(), ";") + ';' + bm.Get("INCLUDE", "") + ';' + add_includes);
for(int i = 0; i < wspc.GetCount(); i++) {
const Package& pkg = wspc.GetPackage(i);
for(int j = 0; j < pkg.include.GetCount(); j++)