summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2023-08-29 22:38:18 +0800
committerruki <[email protected]>2023-08-29 22:38:18 +0800
commitccc860bdb47daea33c48c334a14c1b090e0ad9cf (patch)
tree3d0090bb8502b09e5feb639753a5bbf85cfaea7a
parent8fe8d75c330480b2be064ad877b9f9229fd43738 (diff)
fix qt frameworks #4135
-rw-r--r--xmake/rules/qt/load.lua12
1 files changed, 11 insertions, 1 deletions
diff --git a/xmake/rules/qt/load.lua b/xmake/rules/qt/load.lua
index 0321e0ce4..360e92037 100644
--- a/xmake/rules/qt/load.lua
+++ b/xmake/rules/qt/load.lua
@@ -123,6 +123,16 @@ function _get_target_cppversion(target)
end
end
+-- get values from target
+-- @see https://github.com/xmake-io/xmake/issues/4135
+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}))
+ return table.unique(values)
+end
+
-- the main entry
function main(target, opt)
@@ -234,7 +244,7 @@ function main(target, opt)
-- do frameworks for qt
local frameworksset = hashset.new()
- for _, framework in ipairs(target:get("frameworks")) do
+ for _, framework in ipairs(_get_values_from_target(target, "frameworks")) do
-- translate qt frameworks
if framework:startswith("Qt") then