From 89faba920508a0a5100e131171f097d575955a9d Mon Sep 17 00:00:00 2001 From: k000 Date: Tue, 12 Apr 2022 17:02:26 +0800 Subject: fix vs_runtime not passed to conan package --- xmake/modules/package/manager/conan/install_package.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xmake/modules/package/manager/conan/install_package.lua b/xmake/modules/package/manager/conan/install_package.lua index 9f5a52a18..47d1d25a4 100644 --- a/xmake/modules/package/manager/conan/install_package.lua +++ b/xmake/modules/package/manager/conan/install_package.lua @@ -207,9 +207,9 @@ function main(name, opt) table.insert(argv, "compiler=Visual Studio") table.insert(argv, "-s") table.insert(argv, "compiler.version=" .. assert(vsvers[vs], "unknown msvc version!")) - if opt.vs_runtime then + if configs.vs_runtime then table.insert(argv, "-s") - table.insert(argv, "compiler.runtime=" .. opt.vs_runtime) + table.insert(argv, "compiler.runtime=" .. configs.vs_runtime) end elseif opt.plat == "iphoneos" then local target_minver = nil -- cgit v1.3.1