From 9b1e01c0b6deb3eaae25038643e11ea482ea248a Mon Sep 17 00:00:00 2001 From: ruki Date: Wed, 19 Oct 2022 00:58:10 +0800 Subject: use sysincludedirs --- xmake/core/package/package.lua | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'xmake/core/package/package.lua') diff --git a/xmake/core/package/package.lua b/xmake/core/package/package.lua index 1729eaa00..81b66b945 100644 --- a/xmake/core/package/package.lua +++ b/xmake/core/package/package.lua @@ -1482,12 +1482,21 @@ function _instance:_fetch_library(opt) end end if fetchinfo then + local components_base = fetchinfo.components and fetchinfo.components.__base if opt.external then fetchinfo.sysincludedirs = fetchinfo.sysincludedirs or fetchinfo.includedirs fetchinfo.includedirs = nil + if components_base then + components_base.sysincludedirs = components_base.sysincludedirs or components_base.includedirs + components_base.includedirs = nil + end else fetchinfo.includedirs = fetchinfo.includedirs or fetchinfo.sysincludedirs fetchinfo.sysincludedirs = nil + if components_base then + components_base.includedirs = components_base.includedirs or components_base.sysincludedirs + components_base.sysincludedirs = nil + end end end if fetchinfo and option.get("verbose") then -- cgit v1.3.1