summaryrefslogtreecommitdiff
path: root/xmake/rules/c++/modules/modules_support
diff options
context:
space:
mode:
authorArthur LAURENT <[email protected]>2022-08-05 06:30:01 +0200
committerArthur LAURENT <[email protected]>2022-08-05 06:30:01 +0200
commit59bdca35cd89624f1706ece6fb9d3b448a491a86 (patch)
treeed110cc04164fd340a19fd384de0aad20ebd1468 /xmake/rules/c++/modules/modules_support
parent24c99b08df19fc7fdedd48e5745f7a86fb5b22b2 (diff)
Improve find angle header file
Diffstat (limited to 'xmake/rules/c++/modules/modules_support')
-rw-r--r--xmake/rules/c++/modules/modules_support/common.lua5
1 files changed, 4 insertions, 1 deletions
diff --git a/xmake/rules/c++/modules/modules_support/common.lua b/xmake/rules/c++/modules/modules_support/common.lua
index 8d3c8456d..564517ea1 100644
--- a/xmake/rules/c++/modules/modules_support/common.lua
+++ b/xmake/rules/c++/modules/modules_support/common.lua
@@ -310,7 +310,10 @@ end
function find_angle_header_file(target, file)
local headerpaths = modules_support(target).toolchain_includedirs(target)
for _, dep in ipairs(target:orderdeps()) do
- table.insert(headerpaths, dep:get("sysincludedirs") or dep:get("includedirs"))
+ local includedirs = dep:get("sysincludedirs") or dep:get("includedirs")
+ if includedirs then
+ table.join2(headerpaths, includedirs)
+ end
end
for _, pkg in ipairs(target:pkgs()) do
local includedirs = pkg:get("sysincludedirs") or pkg:get("includedirs")