From 86a73ca5e5fe97e37f59516956b73d64c03f2802 Mon Sep 17 00:00:00 2001 From: ruki Date: Thu, 29 Apr 2021 22:38:09 +0800 Subject: fix vsxmake envs --- xmake/plugins/project/vsxmake/getinfo.lua | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/xmake/plugins/project/vsxmake/getinfo.lua b/xmake/plugins/project/vsxmake/getinfo.lua index 8677c5ddf..97803a115 100644 --- a/xmake/plugins/project/vsxmake/getinfo.lua +++ b/xmake/plugins/project/vsxmake/getinfo.lua @@ -182,6 +182,12 @@ function _make_targetinfo(mode, arch, target) addrunenvs = addrunenvs or {} addrunenvs[k] = table.join(table.wrap(addrunenvs[k]), v) end + for _, dep in ipairs(target:orderdeps()) do + for k, v in pairs(dep:pkgenvs()) do + addrunenvs = addrunenvs or {} + addrunenvs[k] = table.join(table.wrap(addrunenvs[k]), v) + end + end for k, v in pairs(addrunenvs) do if k:upper() == "PATH" then runenvs[k] = format("%s;$([System.Environment]::GetEnvironmentVariable('%s'))", _make_dirs(v), k) -- cgit v1.3.1