diff options
| author | ruki <[email protected]> | 2022-12-14 00:20:56 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2022-12-14 00:20:56 +0800 |
| commit | 73c0fefd21904879a51eef5464ca76c2bd8972eb (patch) | |
| tree | 6e3612842cd6a41aa09e9cd71c92beda4d825af8 | |
| parent | 7ad81bbdec7cb65ef5111f6a1ec3fd7fc812a5fb (diff) | |
fix default components
| -rw-r--r-- | xmake/core/project/target.lua | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/xmake/core/project/target.lua b/xmake/core/project/target.lua index 5fb685824..b0cd6fa0d 100644 --- a/xmake/core/project/target.lua +++ b/xmake/core/project/target.lua @@ -416,10 +416,10 @@ function _instance:get_from_pkgs(name, opt) local configinfo = self:pkgconfig(pkg:name()) -- get values from package components -- e.g. `add_packages("sfml", {components = {"graphics", "window"}})` - local components_default = pkg:components_default() - if configinfo and (configinfo.components or components_default) and pkg:components() then + local selected_components = configinfo and configinfo.components or pkg:components_default() + if selected_components and pkg:components() then local components_enabled = hashset.new() - for _, comp in ipairs(table.wrap(configinfo.components or components_default)) do + for _, comp in ipairs(table.wrap(selected_components)) do components_enabled:insert(comp) for _, dep in ipairs(table.wrap(pkg:component_orderdeps(comp))) do components_enabled:insert(dep) |
