summaryrefslogtreecommitdiff
path: root/xmake/modules/package/manager/find_package.lua
diff options
context:
space:
mode:
authorPaul Reilly <[email protected]>2020-09-16 23:09:57 +0100
committerPaul Reilly <[email protected]>2020-09-16 23:09:57 +0100
commitd79274d2e2d57a873e69463848f0ba4e1074dd7c (patch)
tree69790270a3a85765e645eaee28d5964db5ffd746 /xmake/modules/package/manager/find_package.lua
parentb3368f5e6066725ea4ed291507b82e35db0d9f54 (diff)
improve log output of find_package
Now find_package will log the package manager of any found package that did not specify which package manager to search.
Diffstat (limited to 'xmake/modules/package/manager/find_package.lua')
-rw-r--r--xmake/modules/package/manager/find_package.lua20
1 files changed, 6 insertions, 14 deletions
diff --git a/xmake/modules/package/manager/find_package.lua b/xmake/modules/package/manager/find_package.lua
index eed29f420..db0bd4788 100644
--- a/xmake/modules/package/manager/find_package.lua
+++ b/xmake/modules/package/manager/find_package.lua
@@ -22,6 +22,7 @@
import("core.base.semver")
import("core.base.option")
import("core.project.config")
+import("utils.split_package_name")
-- find package with the builtin rule
--
@@ -131,7 +132,8 @@ end
-- linkdirs = {"/usr/lib"}, includedirs = "/usr/include", links = {"ssl"}, includes = {"ssl.h"}
-- packagedirs = {"/tmp/packages"}, system = true}
--
--- @return {links = {"ssl", "crypto", "z"}, linkdirs = {"/usr/local/lib"}, includedirs = {"/usr/local/include"}}
+-- @return {links = {"ssl", "crypto", "z"}, linkdirs = {"/usr/local/lib"}, includedirs = {"/usr/local/include"}},
+-- manager_name, package_name
--
-- @code
--
@@ -140,6 +142,7 @@ end
-- local package = find_package("openssl", {plat = "iphoneos"})
-- local package = find_package("openssl", {linkdirs = {"/usr/lib", "/usr/local/lib"}, includedirs = "/usr/local/include", version = "1.0.1"})
-- local package = find_package("openssl", {linkdirs = {"/usr/lib", "/usr/local/lib", links = {"ssl", "crypto"}, includes = {"ssl.h"}})
+-- local package, manager_name, package_name = find_package("openssl")
--
-- @endcode
--
@@ -151,18 +154,7 @@ function main(name, opt)
opt.arch = opt.arch or config.get("arch") or os.arch()
opt.mode = opt.mode or config.mode() or "release"
- -- 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 = nil
- else
- manager_name = manager_name:lower():trim()
- end
-
- -- get package name and require version
- local require_version = nil
- package_name, require_version = unpack(package_name:trim():split("%s"))
+ local manager_name, package_name, require_version = split_package_name(name)
opt.version = require_version or opt.version
-- find package
@@ -176,5 +168,5 @@ function main(name, opt)
end
-- ok?
- return result
+ return result, manager_name, package_name
end