diff options
| author | ruki <[email protected]> | 2019-03-29 00:30:39 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2019-03-28 21:03:59 +0800 |
| commit | 3006834c96b0473a718d9067979f971218bedf27 (patch) | |
| tree | 289b809fc432b10e721ead6e124689bc28a6017b | |
| parent | 20b0b64379e610469b037fb1d52def419e4ae18b (diff) | |
improve to install_package for conan
| -rw-r--r-- | xmake/modules/package/manager/conan/install_package.lua | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/xmake/modules/package/manager/conan/install_package.lua b/xmake/modules/package/manager/conan/install_package.lua index 68197f5b1..197409a9b 100644 --- a/xmake/modules/package/manager/conan/install_package.lua +++ b/xmake/modules/package/manager/conan/install_package.lua @@ -145,12 +145,16 @@ function main(name, opt) -- set compiler settings if opt.plat == "windows" then - local vsvers = {["2017"] = "15", ["2015"] = "14", ["2013"] = "12", ["2012"] = "11", ["2010"] = "10", ["2008"] = "9", ["2005"] = "8"} + local vsvers = {["2019"] = "16", ["2017"] = "15", ["2015"] = "14", ["2013"] = "12", ["2012"] = "11", ["2010"] = "10", ["2008"] = "9", ["2005"] = "8"} local vs = assert(config.get("vs"), "vs not found!") table.insert(argv, "-s") 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 + table.insert(argv, "-s") + table.insert(argv, "compiler.runtime=" .. opt.vs_runtime) + end end -- set custom settings |