diff options
| author | ruki <[email protected]> | 2021-07-03 00:34:08 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2021-07-03 00:34:08 +0800 |
| commit | 9068e48983a41c30a020c302913fbdb4e4c66f9e (patch) | |
| tree | 1ef415646d3b6e2765c51b4393661575ed90c6ee /xmake/modules/package/tools/cmake.lua | |
| parent | c44d6060e82fc332e0f7370398bcbbaed7278543 (diff) | |
add os.joinenvs
Diffstat (limited to 'xmake/modules/package/tools/cmake.lua')
| -rw-r--r-- | xmake/modules/package/tools/cmake.lua | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xmake/modules/package/tools/cmake.lua b/xmake/modules/package/tools/cmake.lua index 680d29a9b..f41bf0052 100644 --- a/xmake/modules/package/tools/cmake.lua +++ b/xmake/modules/package/tools/cmake.lua @@ -71,7 +71,7 @@ end -- get msvc run environments function _get_msvc_runenvs(package) - return _get_msvc(package):runenvs() + return os.joinenvs(_get_msvc(package):runenvs()) end -- get cflags from package deps @@ -491,7 +491,7 @@ function buildenvs(package, opt) local envs = {} local cmake_generator = opt.cmake_generator if cmake_generator and cmake_generator == "Ninja" and package:is_plat("windows") then - table.join2(envs, _get_msvc_runenvs(package)) + envs = _get_msvc_runenvs(package) end -- add environments for cmake/find_packages |
