summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authork000 <[email protected]>2022-04-12 17:02:26 +0800
committerk000 <[email protected]>2022-04-12 17:02:26 +0800
commit89faba920508a0a5100e131171f097d575955a9d (patch)
treed6d9dd78b2eabbf0c32bac57e9c3340c66e05d57
parentdf2fe3cae563c89ecd3789d82c4b43c6e0c77096 (diff)
fix vs_runtime not passed to conan package
-rw-r--r--xmake/modules/package/manager/conan/install_package.lua4
1 files 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