From 3d89aadd3022c5cc58dce1e15997568e4be60162 Mon Sep 17 00:00:00 2001 From: ruki Date: Thu, 31 Jan 2019 22:39:36 +0800 Subject: pass custom settings to conan --- xmake/modules/package/manager/conan/install_package.lua | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/xmake/modules/package/manager/conan/install_package.lua b/xmake/modules/package/manager/conan/install_package.lua index 06963ae00..4fdb66ffa 100644 --- a/xmake/modules/package/manager/conan/install_package.lua +++ b/xmake/modules/package/manager/conan/install_package.lua @@ -61,7 +61,9 @@ end -- install package -- -- @param name the package name, e.g. conan::OpenSSL/1.0.2n@conan/stable --- @param opt the options, .e.g {verbose = true, mode = "release", plat = , arch = , remote = "", build = "all", options = {}, imports = {}, build_requires = {}} +-- @param opt the options, .e.g { verbose = true, mode = "release", plat = , arch = , +-- remote = "", build = "all", options = {}, imports = {}, build_requires = {}, +-- settings = {"compiler=Visual Studio", "compiler.version=10", "compiler.runtime=MD"}} -- -- @return true or false -- @@ -138,6 +140,12 @@ function main(name, opt) table.insert(argv, "compiler.version=" .. assert(vsvers[vs], "unknown msvc version!")) end + -- set custom settings + for _, setting in ipairs(opt.settings) do + table.insert(argv, "-s") + table.insert(argv, setting) + end + -- set remote if opt.remote then table.insert(argv, "-r") -- cgit v1.3.1