diff options
| author | Jérôme Leclercq <[email protected]> | 2022-02-10 12:12:45 +0100 |
|---|---|---|
| committer | Jérôme Leclercq <[email protected]> | 2022-02-10 12:12:45 +0100 |
| commit | f2734c060bf981b9349b5bd63dab0f9fb7b6b1df (patch) | |
| tree | 8bf98a59384aa5aaf6d258ac72ccf6ff149d888d /xmake/plugins | |
| parent | c62d50f692935b7369869ac72dfb7b99f6e19941 (diff) | |
Fix runenvs with vs and vsxmake projects
Diffstat (limited to 'xmake/plugins')
| -rw-r--r-- | xmake/plugins/project/vstudio/impl/vs201x.lua | 4 | ||||
| -rw-r--r-- | xmake/plugins/project/vsxmake/getinfo.lua | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/xmake/plugins/project/vstudio/impl/vs201x.lua b/xmake/plugins/project/vstudio/impl/vs201x.lua index 622b949bf..b6ce2fc2d 100644 --- a/xmake/plugins/project/vstudio/impl/vs201x.lua +++ b/xmake/plugins/project/vstudio/impl/vs201x.lua @@ -316,9 +316,9 @@ function _make_targetinfo(mode, arch, target, vcxprojdir) end for k, v in pairs(addrunenvs) do if k:upper() == "PATH" then - runenvs[k] = _make_dirs(v, vcxprojdir) .. "$([System.Environment]::GetEnvironmentVariable('" .. k .. "'))" + runenvs[k] = _make_dirs(v, vcxprojdir) .. ";$([System.Environment]::GetEnvironmentVariable('" .. k .. "'))" else - runenvs[k] = path.joinenv(v) .. "$([System.Environment]::GetEnvironmentVariable('" .. k .."'))" + runenvs[k] = path.joinenv(v) .. ";$([System.Environment]::GetEnvironmentVariable('" .. k .."'))" end end for k, v in pairs(setrunenvs) do diff --git a/xmake/plugins/project/vsxmake/getinfo.lua b/xmake/plugins/project/vsxmake/getinfo.lua index e9403cb35..91f9f2337 100644 --- a/xmake/plugins/project/vsxmake/getinfo.lua +++ b/xmake/plugins/project/vsxmake/getinfo.lua @@ -190,9 +190,9 @@ function _make_targetinfo(mode, arch, target) end for k, v in pairs(addrunenvs) do if k:upper() == "PATH" then - runenvs[k] = _make_dirs(v) .. "$([System.Environment]::GetEnvironmentVariable('" .. k .. "'))" + runenvs[k] = _make_dirs(v) .. ";$([System.Environment]::GetEnvironmentVariable('" .. k .. "'))" else - runenvs[k] = path.joinenv(v) .. "$([System.Environment]::GetEnvironmentVariable('" .. k .."'))" + runenvs[k] = path.joinenv(v) .. ";$([System.Environment]::GetEnvironmentVariable('" .. k .."'))" end end for k, v in pairs(setrunenvs) do |
