diff options
| author | ruki <[email protected]> | 2024-10-12 00:58:00 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2024-10-12 00:58:00 +0800 |
| commit | b9daa8d3f4b2601f3e73b31338cb609aa9768a1a (patch) | |
| tree | 40e995e08875740f9152767ae22351f691b3d192 | |
| parent | d8dc18b5edec681d8860b12b6e7d2d89c297037f (diff) | |
fix install deps
| -rw-r--r-- | xmake/modules/target/action/install/main.lua | 4 | ||||
| -rw-r--r-- | xmake/modules/target/action/uninstall/main.lua | 4 | ||||
| -rw-r--r-- | xmake/plugins/pack/batchcmds.lua | 4 |
3 files changed, 12 insertions, 0 deletions
diff --git a/xmake/modules/target/action/install/main.lua b/xmake/modules/target/action/install/main.lua index 9e51c7a83..5ac99278c 100644 --- a/xmake/modules/target/action/install/main.lua +++ b/xmake/modules/target/action/install/main.lua @@ -97,6 +97,10 @@ function _get_target_libfiles(target, libfiles, binaryfile, refs) local dep = target:dep(depname) if dep then if dep:is_shared() then + local depfile = dep:targetfile() + if os.isfile(depfile) then + table.insert(libfiles, depfile) + end _get_target_libfiles(dep, libfiles, dep:targetfile(), refs) elseif dep:is_library() then _get_target_libfiles(dep, libfiles, binaryfile, refs) diff --git a/xmake/modules/target/action/uninstall/main.lua b/xmake/modules/target/action/uninstall/main.lua index 2fdb89790..c4228f23c 100644 --- a/xmake/modules/target/action/uninstall/main.lua +++ b/xmake/modules/target/action/uninstall/main.lua @@ -97,6 +97,10 @@ function _get_target_libfiles(target, libfiles, binaryfile, refs) local dep = target:dep(depname) if dep then if dep:is_shared() then + local depfile = dep:targetfile() + if os.isfile(depfile) then + table.insert(libfiles, depfile) + end _get_target_libfiles(dep, libfiles, dep:targetfile(), refs) elseif dep:is_library() then _get_target_libfiles(dep, libfiles, binaryfile, refs) diff --git a/xmake/plugins/pack/batchcmds.lua b/xmake/plugins/pack/batchcmds.lua index a881cfb18..bf81ddc43 100644 --- a/xmake/plugins/pack/batchcmds.lua +++ b/xmake/plugins/pack/batchcmds.lua @@ -117,6 +117,10 @@ function _get_target_libfiles(target, libfiles, binaryfile, refs) local dep = target:dep(depname) if dep then if dep:is_shared() then + local depfile = dep:targetfile() + if os.isfile(depfile) then + table.insert(libfiles, depfile) + end _get_target_libfiles(dep, libfiles, dep:targetfile(), refs) elseif dep:is_library() then _get_target_libfiles(dep, libfiles, binaryfile, refs) |