diff options
| author | ruki <[email protected]> | 2021-04-13 00:59:47 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2021-04-13 00:59:47 +0800 |
| commit | 317745583da0e5c940f6e300c5f6163eb800efbf (patch) | |
| tree | 77b0bce7ff57ad6d89a0633dcdc15bda8659c094 | |
| parent | 351faa77810f7e0c28d74c55e7c18a7a86e49a5d (diff) | |
improve apt find_package
| -rw-r--r-- | xmake/core/package/package.lua | 9 | ||||
| -rw-r--r-- | xmake/modules/package/manager/apt/find_package.lua | 4 |
2 files changed, 4 insertions, 9 deletions
diff --git a/xmake/core/package/package.lua b/xmake/core/package/package.lua index f564a6a69..3c2f36e75 100644 --- a/xmake/core/package/package.lua +++ b/xmake/core/package/package.lua @@ -1095,15 +1095,8 @@ function _instance:_fetch_library(opt) if on_fetch then fetchinfo = on_fetch(self, {force = opt.force, system = opt.system, + external = opt.external, require_version = opt.require_version}) - if fetchinfo then - -- convert includedirs to sysincludedirs if external headers are enabled - -- in order to simplify user configuration, in the package definition, we always use includedirs - if opt.external then - fetchinfo.sysincludedirs = fetchinfo.includedirs - fetchinfo.includedirs = nil - end - end end if fetchinfo == nil then if opt.system then diff --git a/xmake/modules/package/manager/apt/find_package.lua b/xmake/modules/package/manager/apt/find_package.lua index dd017924e..1eb1720ed 100644 --- a/xmake/modules/package/manager/apt/find_package.lua +++ b/xmake/modules/package/manager/apt/find_package.lua @@ -51,12 +51,14 @@ function main(name, opt) line = line:trim() -- get includedirs + -- we need not add it, gcc/clang will use /usr/ as default sysroot + --[[ local pos = line:find("include/", 1, true) if pos then result = result or {} result.includedirs = result.includedirs or {} table.insert(result.includedirs, line:sub(1, pos + 7)) - end + end]] -- get linkdirs and links if line:endswith(".a") or line:endswith(".so") then |