diff options
| author | Jing <[email protected]> | 2019-04-10 18:50:52 +0800 |
|---|---|---|
| committer | Jing <[email protected]> | 2019-04-10 19:10:24 +0800 |
| commit | e08df53e34cb548089faf6ce1ce8fb2305f8f3e7 (patch) | |
| tree | 7bc6c677da28f9f9315e87ff06a6fd25a408a8c8 | |
| parent | 305f4158f7f18883d2d88ab31542ab6050644961 (diff) | |
improve vcpkg support.
| -rw-r--r-- | xmake/modules/package/manager/vcpkg/find_package.lua | 3 | ||||
| -rw-r--r-- | xmake/modules/package/manager/vcpkg/install_package.lua | 3 |
2 files changed, 6 insertions, 0 deletions
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 |