diff options
| -rw-r--r-- | xmake/modules/detect/sdks/find_qt.lua | 4 | ||||
| -rw-r--r-- | xmake/modules/package/tools/xmake.lua | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/xmake/modules/detect/sdks/find_qt.lua b/xmake/modules/detect/sdks/find_qt.lua index 61f37bbfc..cecf93091 100644 --- a/xmake/modules/detect/sdks/find_qt.lua +++ b/xmake/modules/detect/sdks/find_qt.lua @@ -365,10 +365,10 @@ function main(sdkdir, opt) end -- find qt - local sdkdir = sdkdir or config.get("qt") or global.get("qt") or config.get("sdk") + local real_sdkdir = sdkdir or config.get("qt") or global.get("qt") or config.get("sdk") local sdkver = opt.version or config.get("qt_sdkver") local sdkdir_host = opt.sdkdir_host or config.get("qt_host") or global.get("qt_host") - local qt = _find_qt(sdkdir, sdkver, sdkdir_host) + local qt = _find_qt(real_sdkdir, sdkver, sdkdir_host) if qt then config.set("qt", qt.sdkdir, {force = true, readonly = true}) config.set("qt_sdkver", qt.sdkver, {force = true, readonly = true}) diff --git a/xmake/modules/package/tools/xmake.lua b/xmake/modules/package/tools/xmake.lua index ea0ce9d65..a49a9bf61 100644 --- a/xmake/modules/package/tools/xmake.lua +++ b/xmake/modules/package/tools/xmake.lua @@ -49,7 +49,7 @@ end -- get configs for qt function _get_configs_for_qt(package, configs, opt) - local names = {"qt", "qt_sdkver"} + local names = {"qt", "qt_sdkver", "qt_host"} for _, name in ipairs(names) do local value = get_config(name) if value ~= nil then @@ -226,6 +226,8 @@ function _get_configs_for_cross(package, configs, opt) table.insert(configs, "--" .. name .. "=" .. tostring(value)) end end + _get_configs_for_qt(package, configs, opt) + _get_configs_for_vcpkg(package, configs, opt) end -- get configs |