diff options
| author | ruki <[email protected]> | 2022-09-06 22:36:10 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2022-09-06 22:36:10 +0800 |
| commit | 1fb9ef1571ded01ffe2077edcee0057bf4ced911 (patch) | |
| tree | 6e212c8de704c9d63b47e5fcff5200f0fb7f55fd /xmake/core/package/package.lua | |
| parent | 10d142571fc619051f83d116393ab86a29fcaee2 (diff) | |
rename linkdeps to librarydeps
Diffstat (limited to 'xmake/core/package/package.lua')
| -rw-r--r-- | xmake/core/package/package.lua | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/xmake/core/package/package.lua b/xmake/core/package/package.lua index be2b2f58e..5ec14ff0b 100644 --- a/xmake/core/package/package.lua +++ b/xmake/core/package/package.lua @@ -364,9 +364,9 @@ function _instance:plaindeps() return self._PLAINDEPS end --- get link deps -function _instance:linkdeps() - return self._LINKDEPS +-- get library deps with correct link order +function _instance:librarydeps() + return self._LIBRARYDEPS end -- get parents @@ -758,12 +758,12 @@ function _instance:manifest_save() manifest.configs = self:configs() manifest.envs = self:envs() - -- save enabled link deps - if self:linkdeps() then - manifest.linkdeps = {} - for _, dep in ipairs(self:linkdeps()) do + -- save enabled library deps + if self:librarydeps() then + manifest.librarydeps = {} + for _, dep in ipairs(self:librarydeps()) do if dep:exists() then - table.insert(manifest.linkdeps, dep:name()) + table.insert(manifest.librarydeps, dep:name()) end end end @@ -1600,16 +1600,16 @@ function _instance:exists() return self._FETCHINFO ~= nil end --- fetch link info of dependencies -function _instance:fetch_linkdeps() +-- fetch library dependencies +function _instance:fetch_librarydeps() local fetchinfo = self:fetch() if not fetchinfo then return end fetchinfo = table.copy(fetchinfo) -- avoid the cached fetchinfo be modified - local linkdeps = self:linkdeps() - if linkdeps then - for _, dep in ipairs(linkdeps) do + local librarydeps = self:librarydeps() + if librarydeps then + for _, dep in ipairs(librarydeps) do local depinfo = dep:fetch() if depinfo then for name, values in pairs(depinfo) do @@ -1756,7 +1756,7 @@ end -- generate building configs for has_xxx/check_xxx function _instance:_generate_build_configs(configs, opt) opt = opt or {} - configs = table.join(self:fetch_linkdeps(), configs) + configs = table.join(self:fetch_librarydeps(), configs) if self:is_plat("windows") then local ld = self:build_getenv("ld") local vs_runtime = self:config("vs_runtime") |
