summaryrefslogtreecommitdiff
path: root/xmake/core
diff options
context:
space:
mode:
authorruki <[email protected]>2023-10-26 22:52:20 +0800
committerruki <[email protected]>2023-10-26 22:52:20 +0800
commitb6631aa5791471e0403314fae8dfe44d9408baec (patch)
tree4fadca2ed08a66b1688002bbbbb61ad7a0aea19e /xmake/core
parent76b45e616eef765de745f0e4fa71b8d64fd0a9a7 (diff)
add tests
Diffstat (limited to 'xmake/core')
-rw-r--r--xmake/core/project/target.lua8
1 files changed, 4 insertions, 4 deletions
diff --git a/xmake/core/project/target.lua b/xmake/core/project/target.lua
index 21fd0315f..f58c2de71 100644
--- a/xmake/core/project/target.lua
+++ b/xmake/core/project/target.lua
@@ -317,7 +317,7 @@ function _instance:_get_from_deps(name, result_values, result_sources, opt)
for idx, values in ipairs(dep_values) do
local dep_source = dep_sources[idx]
table.insert(result_values, values)
- table.insert(result_sources, "dep::" .. depname .. "/" .. dep_source)
+ table.insert(result_sources, "dep::" .. dep:name() .. "/" .. dep_source)
end
end
end
@@ -397,7 +397,7 @@ function _instance:_get_from_source(name, source, result_values, result_sources,
table.insert(result_sources, "self")
end
elseif source:startswith("dep::") then
- local depname = source:split("::")[2]
+ local depname = source:split("::", {plain = true, limit = 2})[2]
if depname == "*" then
self:_get_from_deps(name, result_values, result_sources, opt)
else
@@ -432,7 +432,7 @@ function _instance:_get_from_source(name, source, result_values, result_sources,
end
end
elseif source:startswith("option::") then
- local optname = source:split("::")[2]
+ local optname = source:split("::", {plain = true, limit = 2})[2]
if optname == "*" then
self:_get_from_options(name, result_values, result_sources, opt)
else
@@ -446,7 +446,7 @@ function _instance:_get_from_source(name, source, result_values, result_sources,
end
end
elseif source:startswith("package::") then
- local pkgname = source:split("::")[2]
+ local pkgname = source:split("::", {plain = true, limit = 2})[2]
if pkgname == "*" then
self:_get_from_packages(name, result_values, result_sources, opt)
else