summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2023-11-01 00:53:05 +0800
committerruki <[email protected]>2023-11-01 00:53:05 +0800
commit867565453df03c966ecb8fd07a71be47e3fdd7f3 (patch)
tree78c9cac63e651ae581976025173e5052a869324e
parentf18eb052637810b977606c9341d8f9939ebb3f38 (diff)
mark get_from_xxx as deprecated
-rw-r--r--xmake/core/project/target.lua3
-rw-r--r--xmake/rules/qt/load.lua12
-rw-r--r--xmake/rules/utils/inherit_links/inherit_links.lua8
3 files changed, 18 insertions, 5 deletions
diff --git a/xmake/core/project/target.lua b/xmake/core/project/target.lua
index 0027e513e..17a7dad9c 100644
--- a/xmake/core/project/target.lua
+++ b/xmake/core/project/target.lua
@@ -559,6 +559,7 @@ end
-- deprecated: get values from target dependencies
function _instance:get_from_deps(name, opt)
+ deprecated.add("target:get_from(%s, \"dep:*\")", "target:get_from_deps(%s)", name)
local result = {}
local values = self:get_from(name, "dep::*", opt)
if values then
@@ -571,6 +572,7 @@ end
-- deprecated: get values from target options with {interface|public = ...}
function _instance:get_from_opts(name, opt)
+ deprecated.add("target:get_from(%s, \"option::*\")", "target:get_from_opts(%s)", name)
local result = {}
local values = self:get_from(name, "option::*", opt)
if values then
@@ -583,6 +585,7 @@ end
-- deprecated: get values from target packages with {interface|public = ...}
function _instance:get_from_pkgs(name, opt)
+ deprecated.add("target:get_from(%s, \"package::*\")", "target:get_from_pkgs(%s)", name)
local result = {}
local values = self:get_from(name, "package::*", opt)
if values then
diff --git a/xmake/rules/qt/load.lua b/xmake/rules/qt/load.lua
index 477ba0a89..3169b55c1 100644
--- a/xmake/rules/qt/load.lua
+++ b/xmake/rules/qt/load.lua
@@ -127,9 +127,15 @@ end
-- @see https://github.com/xmake-io/xmake/issues/4135
function _get_frameworks_from_target(target)
local values = table.wrap(target:get("frameworks"))
- table.join2(values, target:get_from_opts("frameworks"))
- table.join2(values, target:get_from_pkgs("frameworks"))
- table.join2(values, target:get_from_deps("__qt_frameworks", {interface = true}))
+ for _, value in ipairs((target:get_from("frameworks", "option::*"))) do
+ table.join2(values, value)
+ end
+ for _, value in ipairs((target:get_from("frameworks", "package::*"))) do
+ table.join2(values, value)
+ end
+ for _, value in ipairs((target:get_from("__qt_frameworks", "dep::*", {interface = true}))) do
+ table.join2(values, value)
+ end
return table.unique(values)
end
diff --git a/xmake/rules/utils/inherit_links/inherit_links.lua b/xmake/rules/utils/inherit_links/inherit_links.lua
index 4c38cf788..0c643fdd2 100644
--- a/xmake/rules/utils/inherit_links/inherit_links.lua
+++ b/xmake/rules/utils/inherit_links/inherit_links.lua
@@ -21,8 +21,12 @@
-- 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))
+ for _, value in ipairs((target:get_from(name, "option::*"))) do
+ table.join2(values, value)
+ end
+ for _, value in ipairs((target:get_from(name, "package::*"))) do
+ table.join2(values, value)
+ end
return values
end