X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcomponent.cpp;h=46e9294d039abb2a4cc9ee33c0180acd595239c1;hb=4ee988cdd18d919b11355c21e5234c3f28f5d6a7;hp=bebe3f7790f4c6b20d874a6208e40583f2d6f083;hpb=0e76f1c82e89feea5f49ce20b771fd304bd93bd3;p=builder.git diff --git a/source/component.cpp b/source/component.cpp index bebe3f7..46e9294 100644 --- a/source/component.cpp +++ b/source/component.cpp @@ -101,8 +101,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 sfiles = list_files(*j); - for(list::iterator k=sfiles.begin(); k!=sfiles.end(); ++k) + vector sfiles = list_files(*j); + for(vector::iterator k=sfiles.begin(); k!=sfiles.end(); ++k) { if(j!=dirs.begin()) { @@ -110,7 +110,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); } } }