summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2022-03-23 00:32:35 +0800
committerruki <[email protected]>2022-03-23 00:32:35 +0800
commit90c4840127ac1ec9af5887ed972a74d9856763f7 (patch)
tree25ce0322609dd6e8fd82328d59c99d9daba205e1
parent66d80cda2ba9879600c67adb63abb4674357a083 (diff)
improve import files
-rw-r--r--xmake/rules/utils/install_importfiles/xmake.lua8
1 files changed, 5 insertions, 3 deletions
diff --git a/xmake/rules/utils/install_importfiles/xmake.lua b/xmake/rules/utils/install_importfiles/xmake.lua
index 848f215e1..695f702d2 100644
--- a/xmake/rules/utils/install_importfiles/xmake.lua
+++ b/xmake/rules/utils/install_importfiles/xmake.lua
@@ -22,12 +22,14 @@
rule("utils.install.pkgconfig_importfiles")
after_install(function (target, opt)
opt = opt or {}
- local filename = target:extraconf("rules", "utils.install.pkgconfig_importfiles", "filename")
- import("target.action.install.pkgconfig_importfiles")(target, table.join(opt, {filename = filename}))
+ local configs = target:extraconf("rules", "utils.install.pkgconfig_importfiles")
+ import("target.action.install.pkgconfig_importfiles")(target, table.join(opt, configs))
end)
-- install *.cmake import files
rule("utils.install.cmake_importfiles")
after_install(function (target, opt)
- import("target.action.install.cmake_importfiles")(target, opt)
+ opt = opt or {}
+ local configs = target:extraconf("rules", "utils.install.cmake_importfiles")
+ import("target.action.install.cmake_importfiles")(target, table.join(opt, configs))
end)