From c3c83a1448bcbe12da324f17a643779828bbf9e5 Mon Sep 17 00:00:00 2001 From: ruki Date: Fri, 23 Apr 2021 00:52:51 +0800 Subject: fix vs_runtime --- xmake/modules/private/action/require/impl/package.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xmake/modules/private/action/require/impl/package.lua b/xmake/modules/private/action/require/impl/package.lua index c58cdc9cf..d38e3bd41 100644 --- a/xmake/modules/private/action/require/impl/package.lua +++ b/xmake/modules/private/action/require/impl/package.lua @@ -363,9 +363,6 @@ function _init_requireinfo(requireinfo, package, opt) end requireinfo.configs.vs_runtime = requireinfo.configs.vs_runtime or project.get("target.runtimes") or get_config("vs_runtime") end - if requireinfo.configs.vs_runtime == nil and package:is_plat("windows") then - requireinfo.configs.vs_runtime = "MT" - end end -- merge requireinfo from `add_requireconfs()` @@ -500,6 +497,9 @@ 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 -- cgit v1.3.1