diff options
| author | ruki <[email protected]> | 2019-04-11 10:07:07 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2019-04-11 10:07:07 +0800 |
| commit | f4781b3cbc4d8e61eddb888ea4e7d258adc70c5b (patch) | |
| tree | 539eaf1cb270ac46292f9ab54ee0acfdbb184ca5 | |
| parent | 1243d8fbe1d9e242285631b40e09f43026e31142 (diff) | |
| parent | 84a97cf3471a039bbde45491d5db8eb470b3373e (diff) | |
Merge pull request #387 from ivechan/dev
improve vcpkg support for linux.
| -rw-r--r-- | xmake/modules/package/manager/vcpkg/find_package.lua | 6 | ||||
| -rw-r--r-- | xmake/modules/package/manager/vcpkg/install_package.lua | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/xmake/modules/package/manager/vcpkg/find_package.lua b/xmake/modules/package/manager/vcpkg/find_package.lua index 37d97e7c0..9ec248260 100644 --- a/xmake/modules/package/manager/vcpkg/find_package.lua +++ b/xmake/modules/package/manager/vcpkg/find_package.lua @@ -48,9 +48,9 @@ function main(name, opt) local mode = opt.mode if plat == "macosx" then plat = "osx" - if arch == "x86_64" then - arch = "x64" - end + end + if arch == "x86_64" then + arch = "x64" end -- get the vcpkg installed directory diff --git a/xmake/modules/package/manager/vcpkg/install_package.lua b/xmake/modules/package/manager/vcpkg/install_package.lua index 8716b004f..4a2b4fcca 100644 --- a/xmake/modules/package/manager/vcpkg/install_package.lua +++ b/xmake/modules/package/manager/vcpkg/install_package.lua @@ -47,9 +47,9 @@ function main(name, opt) local mode = opt.mode if plat == "macosx" then plat = "osx" - if arch == "x86_64" then - arch = "x64" - end + end + if arch == "x86_64" then + arch = "x64" end -- check architecture |