summaryrefslogtreecommitdiff
path: root/xmake/modules/package/tools/meson.lua
diff options
context:
space:
mode:
authorruki <[email protected]>2024-03-25 22:43:24 +0800
committerruki <[email protected]>2024-03-25 22:43:24 +0800
commit9cfe38a40ed4a37c4977272a98952ee311332ba2 (patch)
treed388f73b099d76e4de0beb2e2c53b46cbb90d419 /xmake/modules/package/tools/meson.lua
parente1d5f432ab3d0fac43ee6a4852efe7b99f6ef428 (diff)
improve meson build
Diffstat (limited to 'xmake/modules/package/tools/meson.lua')
-rw-r--r--xmake/modules/package/tools/meson.lua11
1 files changed, 4 insertions, 7 deletions
diff --git a/xmake/modules/package/tools/meson.lua b/xmake/modules/package/tools/meson.lua
index f03758373..d76c36784 100644
--- a/xmake/modules/package/tools/meson.lua
+++ b/xmake/modules/package/tools/meson.lua
@@ -506,20 +506,17 @@ end
-- install package
function install(package, configs, opt)
- -- generate build files
+ -- do build
opt = opt or {}
- generate(package, configs, opt)
+ build(package, configs, opt)
-- configure install
local buildir = _get_buildir(package, opt)
local argv = {"install", "-C", buildir}
- if option.get("verbose") then
- table.insert(argv, "-v")
- end
- -- do build and install
+ -- do install
local meson = assert(find_tool("meson"), "meson not found!")
- os.vrunv(meson.program, {"install", "-C", buildir}, {envs = opt.envs or buildenvs(package, opt)})
+ os.vrunv(meson.program, argv, {envs = opt.envs or buildenvs(package, opt)})
-- fix static libname on windows
if package:is_plat("windows") and not package:config("shared") then