remove some get_from_pkgs

4 files changed, 21 insertions, 16 deletions

diff --git a/xmake/plugins/project/cmake/cmakelists.lua b/xmake/plugins/project/cmake/cmakelists.lua
index 840ed4d07..fd0f6ff2c 100644
--- a/xmake/plugins/project/cmake/cmakelists.lua
+++ b/xmake/plugins/project/cmake/cmakelists.lua
@@ -124,10 +124,9 @@ function _get_configs_from_target(target, name)
     if name:find("flags", 1, true) then
         table.join2(values, target:toolconfig(name))
     end
-    table.join2(values, target:get(name))
-    table.join2(values, target:get_from_opts(name))
-    table.join2(values, target:get_from_pkgs(name))
-    table.join2(values, target:get_from_deps(name, {interface = true}))
+    for _, value in ipairs((target:get_from(name, "*"))) do
+        table.join2(values, value)
+    end
     if not name:find("flags", 1, true) then -- for includedirs, links ..
         table.join2(values, target:toolconfig(name))
     end
diff --git a/xmake/plugins/project/vsxmake/getinfo.lua b/xmake/plugins/project/vsxmake/getinfo.lua
index eaa671ac3..7ec79ad6e 100644
--- a/xmake/plugins/project/vsxmake/getinfo.lua
+++ b/xmake/plugins/project/vsxmake/getinfo.lua
@@ -90,10 +90,10 @@ end
 
 -- get values from target
 function _get_values_from_target(target, name)
-    local values = table.wrap(target:get(name))
-    table.join2(values, target:get_from_opts(name))
-    table.join2(values, target:get_from_pkgs(name))
-    table.join2(values, target:get_from_deps(name, {interface = true}))
+    local values = {}
+    for _, value in ipairs((target:get_from(name, "*"))) do
+        table.join2(values, value)
+    end
     return table.unique(values)
 end
 
diff --git a/xmake/plugins/show/info/target.lua b/xmake/plugins/show/info/target.lua
index eae41f4b9..e3aa8829d 100644
--- a/xmake/plugins/show/info/target.lua
+++ b/xmake/plugins/show/info/target.lua
@@ -114,11 +114,17 @@ function _get_values_from_deps(target, name)
             for _, value in ipairs(dep:get(name, {interface = true})) do
                 values[value] = string.format(" -> dep(%s)", dep:name())
             end
-            for _, value in ipairs(dep:get_from_opts(name, {interface = true})) do
-                values[value] = string.format(" -> dep(%s) -> options", dep:name())
+            local values_chunks = dep:get_from(name, "option::*", {interface = true})
+            for _, values_chunk in ipairs(values_chunks) do
+                for _, value in ipairs(values_chunk) do
+                    values[value] = string.format(" -> dep(%s) -> options", dep:name())
+                end
             end
-            for _, value in ipairs(dep:get_from_pkgs(name, {interface = true})) do
-                values[value] = string.format(" -> dep(%s) -> packages", dep:name())
+            values_chunks = dep:get_from(name, "package::*", {interface = true})
+            for _, values_chunk in ipairs(values_chunks) do
+                for _, value in ipairs(values_chunk) do
+                    values[value] = string.format(" -> dep(%s) -> packages", dep:name())
+                end
             end
         end
     end
diff --git a/xmake/rules/qt/moc/xmake.lua b/xmake/rules/qt/moc/xmake.lua
index 1b90757b6..623d3a6cb 100644
--- a/xmake/rules/qt/moc/xmake.lua
+++ b/xmake/rules/qt/moc/xmake.lua
@@ -61,10 +61,10 @@ rule("qt.moc")
         -- get values from target
         -- @see https://github.com/xmake-io/xmake/issues/3930
         local function _get_values_from_target(target, name)
-            local values = table.wrap(target:get(name))
-            table.join2(values, target:get_from_opts(name))
-            table.join2(values, target:get_from_pkgs(name))
-            table.join2(values, target:get_from_deps(name, {interface = true}))
+            local values = {}
+            for _, value in ipairs((target:get_from(name, "*"))) do
+                table.join2(values, value)
+            end
             return table.unique(values)
         end