diff options
| author | ruki <[email protected]> | 2021-11-08 15:07:07 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-11-08 15:07:07 +0800 |
| commit | 97f278eff5579ceef47ff86ad028746ff0713153 (patch) | |
| tree | cde4d02a1955162f124e84bb627e89d118f758a2 | |
| parent | 7862d3f7c88f9afe1898b8447854754614094bc3 (diff) | |
Update find_package.lua
| -rw-r--r-- | xmake/modules/package/manager/brew/find_package.lua | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/xmake/modules/package/manager/brew/find_package.lua b/xmake/modules/package/manager/brew/find_package.lua index d5f679f7a..9706bfd8e 100644 --- a/xmake/modules/package/manager/brew/find_package.lua +++ b/xmake/modules/package/manager/brew/find_package.lua @@ -67,14 +67,16 @@ function main(name, opt) -- find package from pkg-config/*.pc, attempt to find it from `brew --prefix`/package first local result = nil - local pcfile = find_file(pcname .. ".pc", path.join(brew_pkg_rootdir, nameinfo[1], "*/lib/pkgconfig")) + local pcfile = find_file(pcname .. ".pc", path.join(brew_pkg_rootdir, nameinfo[1], "*/lib/pkgconfig")) or + find_file(pcname .. ".pc", path.join(brew_pkg_rootdir, nameinfo[1], "*/share/pkgconfig")) if not pcfile then -- attempt to find it from `brew --prefix package` local brew = find_tool("brew") local brew_pkgdir = brew and try {function () return os.iorunv(brew.program, {"--prefix", nameinfo[1]}) end} if brew_pkgdir then brew_pkgdir = brew_pkgdir:trim() - pcfile = find_file(pcname .. ".pc", path.join(brew_pkgdir, "lib/pkgconfig")) + pcfile = find_file(pcname .. ".pc", path.join(brew_pkgdir, "lib/pkgconfig")) or + find_file(pcname .. ".pc", path.join(brew_pkgdir, "share/pkgconfig")) end end if pcfile then |