Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support absolute library path of the package when link #5099

Merged
merged 4 commits into from
May 13, 2024
Merged

Support absolute library path of the package when link #5099

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7b61af9
link full path for packages #5066
waruqi May 13, 2024
3cf9f4d
improve package links
waruqi May 13, 2024
5148f8f
fix libfiles
waruqi May 13, 2024
0c7941e
remove linkdirs for linkpath
waruqi May 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 39 additions & 1 deletion xmake/core/project/target.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,6 +303,15 @@ end

-- get values from target packages with {interface|public = ...}
function _instance:_get_from_packages(name, result_values, result_sources, opt)
local function _filter_libfiles(libfiles)
local result = {}
for _, libfile in ipairs(table.wrap(libfiles)) do
if not libfile:endswith(".dll") then
table.insert(result, libfile)
end
end
return table.unwrap(result)
end
for _, pkg in ipairs(self:orderpkgs(opt)) do
local configinfo = self:pkgconfig(pkg:name())
-- get values from package components
Expand All @@ -325,7 +334,22 @@ function _instance:_get_from_packages(name, result_values, result_sources, opt)
if components_enabled:has(component_name) then
local info = components[component_name]
if info then
table.join2(values, info[name])
local compvalues = info[name]
-- use full link path instead of links
-- @see https://github.com/xmake-io/xmake/issues/5066
if configinfo and configinfo.linkpath then
local libfiles = info.libfiles
if name == "links" then
if libfiles then
compvalues = _filter_libfiles(libfiles)
end
elseif name == "linkdirs" then
if libfiles then
compvalues = nil
end
end
end
table.join2(values, compvalues)
else
local components_str = table.concat(table.wrap(configinfo.components), ", ")
utils.warning("unknown component(%s) in add_packages(%s, {components = {%s}})", component_name, pkg:name(), components_str)
Expand All @@ -347,6 +371,20 @@ function _instance:_get_from_packages(name, result_values, result_sources, opt)
else
-- get values from the builtin package configs
local values = pkg:get(name)
-- use full link path instead of links
-- @see https://github.com/xmake-io/xmake/issues/5066
if configinfo and configinfo.linkpath then
local libfiles = pkg:libraryfiles()
if name == "links" then
if libfiles then
values = _filter_libfiles(libfiles)
end
elseif name == "linkdirs" then
if libfiles then
values = nil
end
end
end
if values ~= nil then
table.insert(result_values, values)
table.insert(result_sources, "package::" .. pkg:name())
Expand Down
Loading