diff options
| author | ruki <[email protected]> | 2022-04-13 00:03:13 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2022-04-13 00:03:13 +0800 |
| commit | 33de5bfd93c27f28db546d4594bd950cc015637a (patch) | |
| tree | 516915b30a8b1da1351b57dc219eb48976a8f15b | |
| parent | 8db3cdabf865392bdf3734a3cc0803bdbd045a09 (diff) | |
| parent | 89faba920508a0a5100e131171f097d575955a9d (diff) | |
Merge pull request #2262 from AtaLuZiK/master
fix vs_runtime not passed to conan package
| -rw-r--r-- | xmake/modules/package/manager/conan/install_package.lua | 4 |
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 |