add includedirs to preprocess stage

1 files changed, 17 insertions, 1 deletions

diff --git a/xmake/rules/c++/modules/modules_support/gcc.lua b/xmake/rules/c++/modules/modules_support/gcc.lua
index 2b65acf27..64199c831 100644
--- a/xmake/rules/c++/modules/modules_support/gcc.lua
+++ b/xmake/rules/c++/modules/modules_support/gcc.lua
@@ -185,8 +185,24 @@ function generate_dependencies(target, sourcebatch, opt)
                     for _, define in ipairs(target:get("defines")) do
                         table.insert(defines, "-D" .. define)
                     end
+                    local includedirs = {}
+                    for _, dep in ipairs(target:orderdeps()) do
+                        local includedir = dep:get("sysincludedirs") or dep:get("includedirs")
+                        if includedir then
+                            table.join2(includedirs, includedir)
+                        end
+                    end
+                    for _, pkg in pairs(target:pkgs()) do
+                        local includedir = pkg:get("sysincludedirs") or pkg:get("includedirs")
+                        if includedir then
+                            table.join2(includedirs, includedir)
+                        end
+                    end
+                    for i, includedir in pairs(includedirs) do
+                        includedirs[i] = "-I" .. includedir
+                    end
                     local ifile = path.translate(path.join(outputdir, path.filename(file) .. ".i"))
-                    os.vrunv(compinst:program(), table.join(defines, {get_cppversionflag(target), "-E", "-x", "c++", file,  "-o", ifile}))
+                    os.vrunv(compinst:program(), table.join(includedirs, defines, {get_cppversionflag(target), "-E", "-x", "c++", file,  "-o", ifile}))
                     local content = io.readfile(ifile)
                     os.rm(ifile)
                     return content