diff options
| author | Redbeanw44602 <[email protected]> | 2025-07-28 15:15:23 +0800 |
|---|---|---|
| committer | Redbeanw44602 <[email protected]> | 2025-07-28 15:15:23 +0800 |
| commit | 650b30b94c8a5a0a0e6113cf4e7bc4bc5e50904c (patch) | |
| tree | c362291b301892c15f2b277630d3ffc95cd71928 | |
| parent | 2c38d7dc3d9c1eb90bb481968918170f5d127237 (diff) | |
fix.
| -rw-r--r-- | xmake/modules/package/tools/cmake.lua | 4 | ||||
| -rw-r--r-- | xmake/modules/package/tools/gn.lua | 2 | ||||
| -rw-r--r-- | xmake/modules/package/tools/xmake.lua | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/xmake/modules/package/tools/cmake.lua b/xmake/modules/package/tools/cmake.lua index 2ce3dbd3e..b677a8f0f 100644 --- a/xmake/modules/package/tools/cmake.lua +++ b/xmake/modules/package/tools/cmake.lua @@ -1110,7 +1110,7 @@ function _build_for_ninja(package, configs, opt) _fix_pdbdir_for_ninja(package) ninja.build(package, {}, {envs = opt.envs or buildenvs(package, opt), jobs = opt.jobs, - targets = opt.target or opt.targets}) + targets = opt.targets or opt.target}) end -- do build for cmake/build @@ -1199,7 +1199,7 @@ function _install_for_ninja(package, configs, opt) _fix_pdbdir_for_ninja(package) ninja.install(package, {}, {envs = opt.envs or buildenvs(package, opt), jobs = opt.jobs, - targets = opt.target or opt.targets}) + targets = opt.targets or opt.target}) end -- do install for cmake/build diff --git a/xmake/modules/package/tools/gn.lua b/xmake/modules/package/tools/gn.lua index bb4132310..7813b14be 100644 --- a/xmake/modules/package/tools/gn.lua +++ b/xmake/modules/package/tools/gn.lua @@ -140,6 +140,6 @@ function install(package, configs, opt) -- do build and install local builddir = _get_builddir(opt) - local targets = table.wrap(opt.target or opt.targets) + local targets = table.wrap(opt.targets or opt.target) ninja.install(package, targets, {builddir = builddir, envs = opt.envs or buildenvs(package, opt)}) end diff --git a/xmake/modules/package/tools/xmake.lua b/xmake/modules/package/tools/xmake.lua index 8a96f52da..f8b48bb41 100644 --- a/xmake/modules/package/tools/xmake.lua +++ b/xmake/modules/package/tools/xmake.lua @@ -528,8 +528,8 @@ function install(package, configs, opt) table.insert(argv, "--jobs=" .. njob) end local targets = table.wrap(opt.targets or opt.target) - if #target ~= 0 then - table.join2(argv, target) + if #targets ~= 0 then + table.join2(argv, targets) end os.vrunv(os.programfile(), argv, {envs = envs}) |
