]> git.tdb.fi Git - builder.git/commitdiff
Remove the implicit include path for the generated source directory
authorMikko Rasa <tdb@tdb.fi>
Tue, 7 Mar 2023 23:36:26 +0000 (01:36 +0200)
committerMikko Rasa <tdb@tdb.fi>
Tue, 7 Mar 2023 23:36:26 +0000 (01:36 +0200)
It doesn't work properly when a source file includes a header from a
different component in the local package and that header tries to include
a generated header in its own component.  Adding the generated source
directories of all used compnents isn't good either, in case multiple
components have generated headers with the same name.

source/lib/component.cpp

index 637bc187c8dc26fae0fa45600d7721a8dbe1387b..c12a5a8c604916a3777d8a783afe976b4e90177a 100644 (file)
@@ -92,18 +92,6 @@ BuildInfo Component::get_build_info_for_path(const FS::Path &path) const
        // XXX Cache these and check that the directories actually exist before adding them
        BuildInfo binfo = build_info;
 
-       FS::Path gen_dir = package.get_temp_directory()/"generated";
-       if(FS::descendant_depth(path, gen_dir)>=0)
-       {
-               FS::Path subdir = FS::dirname(FS::relative(path, gen_dir));
-               binfo.local_incpath.push_back(package.get_source_directory()/subdir);
-       }
-       else
-       {
-               FS::Path subdir = FS::dirname(FS::relative(path, package.get_source_directory()));
-               binfo.local_incpath.push_back(gen_dir/subdir);
-       }
-
        if(!overlays.empty())
        {
                FS::Path dir = FS::dirname(path);