diff options
| author | fallenink <[email protected]> | 2021-04-29 15:25:03 +0800 |
|---|---|---|
| committer | fallenink <[email protected]> | 2021-04-29 15:25:03 +0800 |
| commit | a2577fc01bf133f866b6c92b504b8991bb679034 (patch) | |
| tree | 96f4f0c25f931dcf05dd359ab73ebeb89600d907 | |
| parent | f56eed0f2ccb9bc7027fdff13a2ff2e9c1ea24d6 (diff) | |
[DEV] refactor `if else` to `table`
| -rw-r--r-- | xmake/modules/package/manager/vcpkg/find_package.lua | 28 | ||||
| -rw-r--r-- | xmake/modules/package/manager/vcpkg/install_package.lua | 28 |
2 files changed, 30 insertions, 26 deletions
diff --git a/xmake/modules/package/manager/vcpkg/find_package.lua b/xmake/modules/package/manager/vcpkg/find_package.lua index b3466ad94..34df916af 100644 --- a/xmake/modules/package/manager/vcpkg/find_package.lua +++ b/xmake/modules/package/manager/vcpkg/find_package.lua @@ -85,21 +85,23 @@ function main(name, opt) plat = "osx" end - -- mapping arch - if arch == "x86_64" then - arch = "x64" - elseif arch == "i386" then - arch = "x86" + -- archs mapping for vcpkg + local archs = { + x86_64 = "x64", + i386 = "x86", + -- android: armeabi armeabi-v7a arm64-v8a x86 x86_64 mips mip64 - -- vcpkg triplets not support plat_android, but offers a doc: https://github.com/microsoft/vcpkg/blob/master/docs/users/android.md - elseif arch == "arm64-v8a" then - arch = "arm64" - elseif arch == "armeabi-v7a" then - arch = "arm" + -- Offers a doc: https://github.com/microsoft/vcpkg/blob/master/docs/users/android.md + ["armeabi-v7a"] = "arm", + ["arm64-v8a"] = "arm64", + -- ios: arm64 armv7 armv7s i386 - elseif arch == "armv7" or arch == "armv7s" then - arch = "arm" - end + armv7 = "arm", + armv7s = "arm", + arm64 = "arm64", + } + -- mapping arch + arch = archs[arch] or arch -- 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 115493b35..eaf28710e 100644 --- a/xmake/modules/package/manager/vcpkg/install_package.lua +++ b/xmake/modules/package/manager/vcpkg/install_package.lua @@ -47,21 +47,23 @@ function main(name, opt) plat = "osx" end - -- mapping arch - if arch == "x86_64" then - arch = "x64" - elseif arch == "i386" then - arch = "x86" + -- archs mapping for vcpkg + local archs = { + x86_64 = "x64", + i386 = "x86", + -- android: armeabi armeabi-v7a arm64-v8a x86 x86_64 mips mip64 - -- vcpkg triplets not support plat_android, but offers a doc: https://github.com/microsoft/vcpkg/blob/master/docs/users/android.md - elseif arch == "arm64-v8a" then - arch = "arm64" - elseif arch == "armeabi-v7a" then - arch = "arm" + -- Offers a doc: https://github.com/microsoft/vcpkg/blob/master/docs/users/android.md + ["armeabi-v7a"] = "arm", + ["arm64-v8a"] = "arm64", + -- ios: arm64 armv7 armv7s i386 - elseif arch == "armv7" or arch == "armv7s" then - arch = "arm" - end + armv7 = "arm", + armv7s = "arm", + arm64 = "arm64", + } + -- mapping arch + arch = archs[arch] or arch -- init triplet local triplet = arch .. "-" .. plat |