summaryrefslogtreecommitdiff
path: root/xmake/modules/package/manager
diff options
context:
space:
mode:
authorruki <[email protected]>2020-11-08 09:26:40 +0800
committerruki <[email protected]>2020-11-08 09:26:40 +0800
commit8b032f72b8f3972fe702b6f3f20d07d2d1696739 (patch)
tree2403a1b907d1e8c75af614bf63ad51537c648efc /xmake/modules/package/manager
parent52752cabc0e30823245be3eacc07d95d9161a156 (diff)
add license for target and find_package
Diffstat (limited to 'xmake/modules/package/manager')
-rw-r--r--xmake/modules/package/manager/xmake/find_package.lua7
1 files changed, 4 insertions, 3 deletions
diff --git a/xmake/modules/package/manager/xmake/find_package.lua b/xmake/modules/package/manager/xmake/find_package.lua
index 9ef351a87..4508ecde9 100644
--- a/xmake/modules/package/manager/xmake/find_package.lua
+++ b/xmake/modules/package/manager/xmake/find_package.lua
@@ -128,8 +128,8 @@ function _find_package_from_repo(name, opt)
for _, link in ipairs(links) do
local libinfo = find_library(link, linkdirs)
if libinfo then
- result.links = table.join(result.links or {}, libinfo.link)
- result.linkdirs = table.join(result.linkdirs or {}, libinfo.linkdir)
+ result.links = table.join(result.links or {}, libinfo.link)
+ result.linkdirs = table.join(result.linkdirs or {}, libinfo.linkdir)
result.libfiles = table.join(result.libfiles or {}, path.join(libinfo.linkdir, libinfo.filename))
end
end
@@ -158,8 +158,9 @@ function _find_package_from_repo(name, opt)
end
end
- -- get version
+ -- get version and license
result.version = manifest.version or path.filename(path.directory(path.directory(manifest_file)))
+ result.license = manifest.license
return result
end