diff options
| author | Arthur LAURENT <[email protected]> | 2022-12-04 22:07:02 +0100 |
|---|---|---|
| committer | Arthur LAURENT <[email protected]> | 2022-12-05 01:08:30 +0100 |
| commit | 490cc7336f3ef41866b90e65caab84fa6bb9fdfe (patch) | |
| tree | cd8b91785da5af413ecf6456abb451bf5063b739 /xmake/rules/c++ | |
| parent | 49d732c29c8e97ad09fbf35effa1b7bdeda1c727 (diff) | |
fix missing includedirs on fallback generation module deps
Diffstat (limited to 'xmake/rules/c++')
| -rw-r--r-- | xmake/rules/c++/modules/modules_support/clang.lua | 2 | ||||
| -rw-r--r-- | xmake/rules/c++/modules/modules_support/gcc.lua | 2 | ||||
| -rw-r--r-- | xmake/rules/c++/modules/modules_support/msvc.lua | 3 |
3 files changed, 3 insertions, 4 deletions
diff --git a/xmake/rules/c++/modules/modules_support/clang.lua b/xmake/rules/c++/modules/modules_support/clang.lua index 7bb9b2725..9cad5f2ff 100644 --- a/xmake/rules/c++/modules/modules_support/clang.lua +++ b/xmake/rules/c++/modules/modules_support/clang.lua @@ -259,7 +259,7 @@ function generate_dependencies(target, sourcebatch, opt) for _, define in pairs(target:get("defines")) do table.insert(defines, "-D" .. define) end - local includedirs = {} + local includedirs = table.join({}, target:get("includedirs")) for _, dep in ipairs(target:orderdeps()) do local includedir = dep:get("sysincludedirs") or dep:get("includedirs") if includedir then diff --git a/xmake/rules/c++/modules/modules_support/gcc.lua b/xmake/rules/c++/modules/modules_support/gcc.lua index 6f1539891..1f9a85f70 100644 --- a/xmake/rules/c++/modules/modules_support/gcc.lua +++ b/xmake/rules/c++/modules/modules_support/gcc.lua @@ -185,7 +185,7 @@ function generate_dependencies(target, sourcebatch, opt) for _, define in ipairs(target:get("defines")) do table.insert(defines, "-D" .. define) end - local includedirs = {} + local includedirs = table.join({}, target:get("includedirs")) for _, dep in ipairs(target:orderdeps()) do local includedir = dep:get("sysincludedirs") or dep:get("includedirs") if includedir then diff --git a/xmake/rules/c++/modules/modules_support/msvc.lua b/xmake/rules/c++/modules/modules_support/msvc.lua index 616a2d082..d56a71e6d 100644 --- a/xmake/rules/c++/modules/modules_support/msvc.lua +++ b/xmake/rules/c++/modules/modules_support/msvc.lua @@ -194,7 +194,7 @@ function generate_dependencies(target, sourcebatch, opt) for _, define in ipairs(target:get("defines")) do table.insert(defines, "/D" .. define) end - local _includedirs = {} + local includedirs = table.join({}, target:get("includedirs")) for _, dep in ipairs(target:orderdeps()) do local includedir = dep:get("sysincludedirs") or dep:get("includedirs") if includedir then @@ -207,7 +207,6 @@ function generate_dependencies(target, sourcebatch, opt) table.join2(includedirs, includedir) end end - local includedirs = {} for i, includedir in pairs(_includedirs) do table.insert(includedirs, "/I") table.insert(includedirs, includedir) |