summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2023-03-10 17:39:53 +0800
committerGitHub <[email protected]>2023-03-10 17:39:53 +0800
commitfdb8bc00233b61f17390f2ac60ae18d710a7a535 (patch)
tree65fb46007586bc05717dfd24b0cf12d142781400
parenteb6314a1747a4f24640e7ce66992de74fa6aa04c (diff)
parent74201f1e162cb4286d76dc9e90a38d3766330b6f (diff)
Merge pull request #3490 from star-hengxing/ninja
fix ninja opt
-rw-r--r--xmake/modules/package/tools/cmake.lua10
1 files changed, 8 insertions, 2 deletions
diff --git a/xmake/modules/package/tools/cmake.lua b/xmake/modules/package/tools/cmake.lua
index 02c36ec2d..da104f8f1 100644
--- a/xmake/modules/package/tools/cmake.lua
+++ b/xmake/modules/package/tools/cmake.lua
@@ -793,7 +793,10 @@ end
-- do build for ninja
function _build_for_ninja(package, configs, opt)
opt = opt or {}
- ninja.build(package, {}, {envs = opt.envs or buildenvs(package, opt)})
+ ninja.build(package, {}, {envs = opt.envs or buildenvs(package, opt),
+ jobs = opt.jobs,
+ buildir = opt.buildir,
+ target = opt.target})
end
-- do build for cmake/build
@@ -875,7 +878,10 @@ end
-- do install for ninja
function _install_for_ninja(package, configs, opt)
opt = opt or {}
- ninja.install(package, {}, {envs = opt.envs or buildenvs(package, opt)})
+ ninja.install(package, {}, {envs = opt.envs or buildenvs(package, opt),
+ jobs = opt.jobs,
+ buildir = opt.buildir,
+ target = opt.target})
end
-- do install for cmake/build