Add the corresponding generated source directory to local include path

[builder.git] / source / component.cpp

diff --git a/source/component.cpp b/source/component.cpp
index 2bfa736e14ea2dc7663fcae75b5f6f8c3329395a..2d09f8a0cd007ed12f9e7c09d2a1c78cc4670b47 100644 (file)
--- a/source/component.cpp
+++ b/source/component.cpp
@@ -2,8 +2,7 @@
 #include <msp/fs/dir.h>
 #include <msp/fs/stat.h>
 #include <msp/fs/utils.h>
-#include <msp/io/print.h>
-#include <msp/strings/lexicalcast.h>
+#include <msp/strings/format.h>
 #include "builder.h"
 #include "component.h"
 #include "sourcepackage.h"
@@ -60,6 +59,19 @@ 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);
@@ -102,8 +114,8 @@ Component::SourceList Component::collect_source_files() const
                        for(SourceList::const_iterator j=dirs.begin(); j!=dirs.end(); ++j)
                        {
                                package.get_builder().get_logger().log("files", format("Traversing %s", *j));
-                               list<string> sfiles = list_files(*j);
-                               for(list<string>::iterator k=sfiles.begin(); k!=sfiles.end(); ++k)
+                               vector<string> sfiles = list_files(*j);
+                               for(vector<string>::iterator k=sfiles.begin(); k!=sfiles.end(); ++k)
                                {
                                        if(j!=dirs.begin())
                                        {
@@ -111,7 +123,9 @@ Component::SourceList Component::collect_source_files() const
                                                        continue;
                                                overlay_files.insert(*k);
                                        }
-                                       files.push_back(*j / *k);
+                                       FS::Path fn = *j / *k;
+                                       if(!FS::is_dir(fn))
+                                               files.push_back(fn);
                                }
                        }
                }