From 980f79bca1a0fc89ab9f7cb698dcf2e299832a27 Mon Sep 17 00:00:00 2001 From: ruki Date: Sat, 1 Apr 2023 00:59:47 +0800 Subject: fix conan for msvc #3583 --- 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 688e60f13..550dbbe2e 100644 --- a/xmake/modules/package/manager/conan/install_package.lua +++ b/xmake/modules/package/manager/conan/install_package.lua @@ -120,7 +120,7 @@ end -- @param opt the options, e.g. { verbose = true, mode = "release", plat = , arch = , -- configs = { -- remote = "", build = "all", options = {}, imports = {}, build_requires = {}, --- settings = {"compiler=Visual Studio", "compiler.version=10", "compiler.runtime=MD"}}} +-- settings = {"compiler=msvc", "compiler.version=10", "compiler.runtime=MD"}}} -- -- @return true or false -- @@ -217,7 +217,7 @@ function main(name, opt) ["2005"] = "8"} local vs = assert(config.get("vs"), "vs not found!") table.insert(argv, "-s") - table.insert(argv, "compiler=Visual Studio") + table.insert(argv, "compiler=msvc") table.insert(argv, "-s") table.insert(argv, "compiler.version=" .. assert(vsvers[vs], "unknown msvc version!")) if configs.vs_runtime then -- cgit v1.3.1