From 7204438408a9cd31209af408d911ea45cdcb080e Mon Sep 17 00:00:00 2001 From: ruki Date: Sun, 11 Aug 2019 22:47:44 +0800 Subject: improve find_package for pkg-config --- xmake/modules/package/manager/brew/find_package.lua | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'xmake/modules/package') diff --git a/xmake/modules/package/manager/brew/find_package.lua b/xmake/modules/package/manager/brew/find_package.lua index 5eb2beba3..0a2648eb7 100644 --- a/xmake/modules/package/manager/brew/find_package.lua +++ b/xmake/modules/package/manager/brew/find_package.lua @@ -21,6 +21,7 @@ -- imports import("lib.detect.find_tool") import("lib.detect.find_file") +import("lib.detect.pkg_config") import("package.manager.find_package") -- find package from the brew package manager @@ -50,6 +51,14 @@ function main(name, opt) if pcfile then opt.configdirs = path.directory(pcfile) result = find_package("pkg_config::" .. pcname, opt) + if not result then + -- attempt to get includedir variable from pkg-config/xx.pc + local pkginfo = pkg_config.info(pcname, table.join(opt, {variables = "includedir"})) + if pkginfo.includedir then + result = result or {} + result.includedirs = pkginfo.includedir + end + end end -- find package from xxx/lib, xxx/include -- cgit v1.3.1