diff options
| author | ruki <[email protected]> | 2021-04-23 22:32:46 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2021-04-23 22:32:46 +0800 |
| commit | 9638fe2dad5b4f1803fdcea51bb6303da19de326 (patch) | |
| tree | 3a7de9468d1bb68b752c7f9ed9657473c2da3c43 | |
| parent | c3c83a1448bcbe12da324f17a643779828bbf9e5 (diff) | |
fix default vs_runtime
| -rw-r--r-- | xmake/modules/private/action/require/impl/package.lua | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/xmake/modules/private/action/require/impl/package.lua b/xmake/modules/private/action/require/impl/package.lua index d38e3bd41..21f0b4aa5 100644 --- a/xmake/modules/private/action/require/impl/package.lua +++ b/xmake/modules/private/action/require/impl/package.lua @@ -365,6 +365,14 @@ function _init_requireinfo(requireinfo, package, opt) end end +-- set default requireinfo +function _set_requireinfo_default(requireinfo, package) + requireinfo.configs = requireinfo.configs or {} + if requireinfo.configs.vs_runtime == nil and package:is_plat("windows") then + requireinfo.configs.vs_runtime = "MT" + end +end + -- merge requireinfo from `add_requireconfs()` -- -- add_requireconfs("*", {system = false, configs = {vs_runtime = "MD"}}) @@ -497,9 +505,6 @@ function _inherit_parent_configs(requireinfo, package, parentinfo) requireinfo_configs.vs_runtime = requireinfo_configs.vs_runtime or parentinfo_configs.vs_runtime requireinfo.configs = requireinfo_configs end - if requireinfo.configs.vs_runtime == nil and package:is_plat("windows") then - requireinfo.configs.vs_runtime = "MT" - end end -- load required packages @@ -549,6 +554,9 @@ function _load_package(packagename, requireinfo, opt) _inherit_parent_configs(requireinfo, package, opt.parentinfo) end + -- set default requireinfo + _set_requireinfo_default(requireinfo, package) + -- select package version local version, source = _select_package_version(package, requireinfo) if version then |
