From e08df53e34cb548089faf6ce1ce8fb2305f8f3e7 Mon Sep 17 00:00:00 2001 From: Jing Date: Wed, 10 Apr 2019 18:50:52 +0800 Subject: improve vcpkg support. --- xmake/modules/package/manager/vcpkg/find_package.lua | 3 +++ xmake/modules/package/manager/vcpkg/install_package.lua | 3 +++ 2 files changed, 6 insertions(+) diff --git a/xmake/modules/package/manager/vcpkg/find_package.lua b/xmake/modules/package/manager/vcpkg/find_package.lua index 37d97e7c0..3ed416686 100644 --- a/xmake/modules/package/manager/vcpkg/find_package.lua +++ b/xmake/modules/package/manager/vcpkg/find_package.lua @@ -52,6 +52,9 @@ function main(name, opt) arch = "x64" end end + if plat == "linux" and arch == "x86_64" then + arch = "x64" + end -- get the vcpkg installed directory local installdir = path.join(vcpkgdir, "installed") diff --git a/xmake/modules/package/manager/vcpkg/install_package.lua b/xmake/modules/package/manager/vcpkg/install_package.lua index 8716b004f..715714281 100644 --- a/xmake/modules/package/manager/vcpkg/install_package.lua +++ b/xmake/modules/package/manager/vcpkg/install_package.lua @@ -51,6 +51,9 @@ function main(name, opt) arch = "x64" end end + if plat == "linux" and arch == "x86_64" then + arch = "x64" + end -- check architecture if opt.arch ~= os.arch() then -- cgit v1.3.1