diff options
| author | ruki <[email protected]> | 2021-05-21 23:10:19 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2021-05-21 23:10:19 +0800 |
| commit | f1c8144ef2a1461defedfedea4ed331eba5dc5e6 (patch) | |
| tree | c8a5ebfb92e088b80a3f021161473976aa0282ac /xmake/modules/private/action/require/impl | |
| parent | 6eea080650bdf56d01384eb735f76a4aa56676f5 (diff) | |
support search packages from vcpkg
Diffstat (limited to 'xmake/modules/private/action/require/impl')
| -rw-r--r-- | xmake/modules/private/action/require/impl/search_packages.lua | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/xmake/modules/private/action/require/impl/search_packages.lua b/xmake/modules/private/action/require/impl/search_packages.lua index 49183a6cc..00cf1ffbf 100644 --- a/xmake/modules/private/action/require/impl/search_packages.lua +++ b/xmake/modules/private/action/require/impl/search_packages.lua @@ -18,19 +18,23 @@ -- @file search_packages.lua -- --- imports -import("core.package.package", {alias = "core_package"}) -import("private.action.require.impl.repository") - -- search packages from repositories function _search_packages(name) + -- get package manager name + local manager_name, package_name = unpack(name:split("::", {plain = true, strict = true})) + if package_name == nil then + package_name = manager_name + manager_name = "xmake" + else + manager_name = manager_name:lower():trim() + end + + -- search packages local packages = {} - for _, packageinfo in ipairs(repository.searchdirs(name)) do - local package = core_package.load_from_repository(packageinfo.name, packageinfo.repo, packageinfo.packagedir) - if package then - table.insert(packages, package) - end + local result = import("package.manager." .. manager_name .. ".search_package", {anonymous = true})(package_name) + if result then + table.join2(packages, result) end return packages end |
