From 5ed8be2195cbf1001fcae218e67a06a6164d57e9 Mon Sep 17 00:00:00 2001 From: ruki Date: Fri, 12 Jan 2024 00:43:20 +0800 Subject: improve system::find_package --- xmake/core/package/package.lua | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'xmake/core/package/package.lua') diff --git a/xmake/core/package/package.lua b/xmake/core/package/package.lua index 8704b3df1..e30e13260 100644 --- a/xmake/core/package/package.lua +++ b/xmake/core/package/package.lua @@ -1760,8 +1760,13 @@ function _instance:find_package(name, opt) buildhash = self:buildhash(), -- for xmake package or 3rd package manager, e.g. go:: .. cachekey = opt.cachekey or "fetch_package_system", external = opt.external, - includes = opt.includes, -- system/find_package need it - system = system}) + system = system, + -- the following options is only for system::find_package + sourcekind = opt.sourcekind, + package = self, + funcs = opt.funcs, + snippets = snippets, + includes = opt.includes}) end -- fetch the local package info -- cgit v1.3.1 From 7cfdda07ab460cac40ef42f74fe4430f34b559be Mon Sep 17 00:00:00 2001 From: ruki Date: Fri, 12 Jan 2024 00:44:46 +0800 Subject: fix snippets argument --- xmake/core/package/package.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'xmake/core/package/package.lua') diff --git a/xmake/core/package/package.lua b/xmake/core/package/package.lua index e30e13260..4190c43c1 100644 --- a/xmake/core/package/package.lua +++ b/xmake/core/package/package.lua @@ -1765,7 +1765,7 @@ function _instance:find_package(name, opt) sourcekind = opt.sourcekind, package = self, funcs = opt.funcs, - snippets = snippets, + snippets = opt.snippets, includes = opt.includes}) end -- cgit v1.3.1