Add include_paths in dependency gems.

1 files changed, 23 insertions, 0 deletions

diff --git a/tasks/mrbgem_spec.rake b/tasks/mrbgem_spec.rake
index 09e000a4a..c8868fe9c 100644
--- a/tasks/mrbgem_spec.rake
+++ b/tasks/mrbgem_spec.rake
@@ -34,6 +34,8 @@ module MRuby
       attr_accessor :requirements
       attr_reader :dependencies
 
+      attr_accessor :export_include_paths
+
       attr_block MRuby::Build::COMMANDS
 
       def initialize(name, &block)
@@ -71,6 +73,8 @@ module MRuby
 
         @requirements = []
         @dependencies = []
+        @export_include_paths = []
+        @export_include_paths << "#{dir}/include" if File.directory? "#{dir}/include"
 
         instance_eval(&@initializer)
 
@@ -336,6 +340,25 @@ module MRuby
         rescue TSort::Cyclic => e
           fail "Circular mrbgem dependency found: #{e.message}"
         end
+
+        each do |g|
+          import_include_paths(g)
+        end
+      end
+
+      def import_include_paths(g)
+        gem_table = @ary.reduce({}) { |res,v| res[v.name] = v; res }
+        g.dependencies.each do |dep|
+          dep_g = gem_table[dep[:gem]]
+          # We can do recursive call safely
+          # as circular dependency has already detected in the caller.
+          import_include_paths(dep_g)
+
+          g.compilers.each do |compiler|
+            compiler.include_paths += dep_g.export_include_paths
+            g.export_include_paths += dep_g.export_include_paths
+          end
+        end
       end
     end # List
   end # Gem