Skip to content

Commit b9daa8d

Browse files
committed
fix install deps
1 parent d8dc18b commit b9daa8d

File tree

3 files changed

+12
-0
lines changed

3 files changed

+12
-0
lines changed

xmake/modules/target/action/install/main.lua

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,10 @@ function _get_target_libfiles(target, libfiles, binaryfile, refs)
9797
local dep = target:dep(depname)
9898
if dep then
9999
if dep:is_shared() then
100+
local depfile = dep:targetfile()
101+
if os.isfile(depfile) then
102+
table.insert(libfiles, depfile)
103+
end
100104
_get_target_libfiles(dep, libfiles, dep:targetfile(), refs)
101105
elseif dep:is_library() then
102106
_get_target_libfiles(dep, libfiles, binaryfile, refs)

xmake/modules/target/action/uninstall/main.lua

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,10 @@ function _get_target_libfiles(target, libfiles, binaryfile, refs)
9797
local dep = target:dep(depname)
9898
if dep then
9999
if dep:is_shared() then
100+
local depfile = dep:targetfile()
101+
if os.isfile(depfile) then
102+
table.insert(libfiles, depfile)
103+
end
100104
_get_target_libfiles(dep, libfiles, dep:targetfile(), refs)
101105
elseif dep:is_library() then
102106
_get_target_libfiles(dep, libfiles, binaryfile, refs)

xmake/plugins/pack/batchcmds.lua

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,10 @@ function _get_target_libfiles(target, libfiles, binaryfile, refs)
117117
local dep = target:dep(depname)
118118
if dep then
119119
if dep:is_shared() then
120+
local depfile = dep:targetfile()
121+
if os.isfile(depfile) then
122+
table.insert(libfiles, depfile)
123+
end
120124
_get_target_libfiles(dep, libfiles, dep:targetfile(), refs)
121125
elseif dep:is_library() then
122126
_get_target_libfiles(dep, libfiles, binaryfile, refs)

0 commit comments

Comments
 (0)