diff options
| author | ruki <[email protected]> | 2021-02-03 22:18:43 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2021-02-03 22:18:43 +0800 |
| commit | 6933bd53b195c8e95fb18b1af40f623ab76dee54 (patch) | |
| tree | a5bd88466b26b6b682a4080a84f90d51de3acc22 /xmake/actions | |
| parent | c01736b0d6c8677226d4a05dd6df018855514970 (diff) | |
improve package:kind
Diffstat (limited to 'xmake/actions')
| -rw-r--r-- | xmake/actions/require/impl/actions/install.lua | 2 | ||||
| -rw-r--r-- | xmake/actions/require/impl/package.lua | 2 | ||||
| -rw-r--r-- | xmake/actions/require/install.lua | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/xmake/actions/require/impl/actions/install.lua b/xmake/actions/require/impl/actions/install.lua index 69d01c6be..4b077b373 100644 --- a/xmake/actions/require/impl/actions/install.lua +++ b/xmake/actions/require/impl/actions/install.lua @@ -32,7 +32,7 @@ import(".utils.filter") function _patch_pkgconfig(package) -- only binary? need not pkgconfig - if package:kind() == "binary" then + if not package:is_library() then return end diff --git a/xmake/actions/require/impl/package.lua b/xmake/actions/require/impl/package.lua index 281bbaef3..669e0aecc 100644 --- a/xmake/actions/require/impl/package.lua +++ b/xmake/actions/require/impl/package.lua @@ -502,7 +502,7 @@ function _load_package(packagename, requireinfo, opt) _merge_requireinfo(requireinfo, opt.requirepath) -- inherit some builtin configs of parent package, e.g. vs_runtime, pic - if opt.parentinfo and package:kind() ~= "binary" then + if opt.parentinfo and package:is_library() then _inherit_parent_configs(requireinfo, opt.parentinfo) end diff --git a/xmake/actions/require/install.lua b/xmake/actions/require/install.lua index c39569713..c2deeac90 100644 --- a/xmake/actions/require/install.lua +++ b/xmake/actions/require/install.lua @@ -51,7 +51,7 @@ end -- register required package libraries -- libs: includedirs, links, linkdirs ... function _register_required_package_libs(instance, requireinfo, is_deps) - if instance:kind() ~= "binary" then + if instance:is_library() then local fetchinfo = instance:fetch() if fetchinfo then fetchinfo.name = nil |
