Skip to content
This repository was archived by the owner on Apr 8, 2024. It is now read-only.

Commit 0657e55

Browse files
committed
✨ feat: update xmake to v2.8.6
1 parent 75bc510 commit 0657e55

File tree

3 files changed

+6
-7
lines changed

3 files changed

+6
-7
lines changed

tools/scripts/tasks/csp-project/cmake/cmakelists.lua

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -104,10 +104,9 @@ function _get_configs_from_target(target, name)
104104
if name:find("flags", 1, true) then
105105
table.join2(values, target:toolconfig(name))
106106
end
107-
table.join2(values, target:get(name))
108-
table.join2(values, target:get_from_opts(name))
109-
table.join2(values, target:get_from_pkgs(name))
110-
table.join2(values, target:get_from_deps(name, {interface = true}))
107+
for _, value in ipairs((target:get_from(name, "*"))) do
108+
table.join2(values, value)
109+
end
111110
if not name:find("flags", 1, true) then -- for includedirs, links ..
112111
table.join2(values, target:toolconfig(name))
113112
end

tools/scripts/xmake.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@
2121
-- ------------ ---------- -----------------------------------------------
2222
-- 2023-12-17 xqyjlj initial version
2323
--
24-
set_xmakever("2.8.3")
24+
set_xmakever("2.8.6")
2525

2626
local dir = ""
2727
local rcfiles = os.getenv("XMAKE_RCFILES")
2828
if rcfiles then
2929
dir = path.directory(rcfiles) .. "/"
3030
end
3131

32-
add_repositories("csp-repo " .. dir .. "../../repo")
32+
add_repositories("csp-repo " .. dir .. "../..")
3333

3434
includes(dir .. "flags.lua")
3535
includes(dir .. "modules.lua")

xmake.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@
2222
-- 2023-07-03 xqyjlj initial version
2323
--
2424

25-
set_xmakever("2.8.3")
25+
set_xmakever("2.8.6")
2626

2727
set_description("The official package repository of csplink")

0 commit comments

Comments
 (0)