From 59bdca35cd89624f1706ece6fb9d3b448a491a86 Mon Sep 17 00:00:00 2001 From: Arthur LAURENT Date: Fri, 5 Aug 2022 06:30:01 +0200 Subject: Improve find angle header file --- xmake/rules/c++/modules/modules_support/common.lua | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'xmake/rules/c++/modules/modules_support/common.lua') 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") -- cgit v1.3.1