diff options
| author | Paul Reilly <[email protected]> | 2020-09-17 13:55:25 +0100 |
|---|---|---|
| committer | Paul Reilly <[email protected]> | 2020-09-17 13:55:25 +0100 |
| commit | 86ad96245f082ec0b7c188385768d4b88d375256 (patch) | |
| tree | b33427184f2bff989ff36574b942a52a2b0223ef /xmake/modules/lib/detect/find_package.lua | |
| parent | d79274d2e2d57a873e69463848f0ba4e1074dd7c (diff) | |
get package name from manager/find_package, remove "found" from log msg
Diffstat (limited to 'xmake/modules/lib/detect/find_package.lua')
| -rw-r--r-- | xmake/modules/lib/detect/find_package.lua | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/xmake/modules/lib/detect/find_package.lua b/xmake/modules/lib/detect/find_package.lua index eaeb01530..a0f44cb74 100644 --- a/xmake/modules/lib/detect/find_package.lua +++ b/xmake/modules/lib/detect/find_package.lua @@ -23,7 +23,6 @@ import("core.base.option") import("core.project.config") import("lib.detect.cache") import("package.manager.find_package") -import("utils.split_package_name") -- find package using the package manager -- @@ -75,8 +74,8 @@ function main(name, opt) end -- find package - local manager_name, package_name - result, manager_name, package_name = find_package(name, opt) + local found_manager_name, package_name, orig_manager_name + result, found_manager_name, package_name, orig_manager_name = find_package(name, opt) -- cache result cacheinfo[name] = result and result or false @@ -85,13 +84,13 @@ function main(name, opt) -- trace if opt.verbose or option.get("verbose") then if result then + -- only display manager of found package if the package we searched for -- did not specify a package manager - local original_manager_name, _, _ = split_package_name(name) - local display_name = original_manager_name and package_name - or (manager_name .. "::" .. package_name) - - cprint("checking for %s ... ${color.success}found %s %s", name, display_name, result.version and result.version or "") + found_manager_name = found_manager_name or "" + local display_manager = orig_manager_name == found_manager_name and "" or found_manager_name .. "::" + local display_name = display_manager .. package_name + cprint("checking for %s ... ${color.success}%s %s", name, display_name, result.version and result.version or "") else cprint("checking for %s ... ${color.nothing}${text.nothing}", name) end |
