From a19a2d357becce2ce23a6b39d4019ae8093b9bb3 Mon Sep 17 00:00:00 2001 From: ruki Date: Sat, 17 Oct 2020 00:45:22 +0800 Subject: add mingw plat for conan --- xmake/modules/package/manager/conan/find_package.lua | 2 +- xmake/modules/package/manager/conan/install_package.lua | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xmake/modules/package/manager/conan/find_package.lua b/xmake/modules/package/manager/conan/find_package.lua index f4586399c..612a4b912 100644 --- a/xmake/modules/package/manager/conan/find_package.lua +++ b/xmake/modules/package/manager/conan/find_package.lua @@ -29,7 +29,7 @@ end -- get conan platform function _conan_get_plat(opt) - local plats = {macosx = "Macos", windows = "Windows", linux = "Linux", cross = "Linux", iphoneos = "iOS", android = "Android"} + local plats = {macosx = "Macos", windows = "Windows", mingw = "Windows", linux = "Linux", cross = "Linux", iphoneos = "iOS", android = "Android"} return plats[opt.plat] end diff --git a/xmake/modules/package/manager/conan/install_package.lua b/xmake/modules/package/manager/conan/install_package.lua index 8864ce0ce..8e7561826 100644 --- a/xmake/modules/package/manager/conan/install_package.lua +++ b/xmake/modules/package/manager/conan/install_package.lua @@ -167,7 +167,7 @@ function main(name, opt) end -- set platform - local plats = {macosx = "Macos", windows = "Windows", linux = "Linux", cross = "Linux", iphoneos = "iOS", android = "Android"} + local plats = {macosx = "Macos", windows = "Windows", mingw = "Windows", linux = "Linux", cross = "Linux", iphoneos = "iOS", android = "Android"} table.insert(argv, "-s") local plat = plats[opt.plat] if plat then -- cgit v1.3.1