diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2016-11-16 16:11:52 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-16 16:11:52 -0800 |
| commit | 0ca3e5b16007355432a833232ec835530bba3d9b (patch) | |
| tree | 6130c646002ef87aac7cc394392ab4164b553e10 | |
| parent | 592201dfc04734c83b83f1c9f6313a270564c8ec (diff) | |
| parent | d56ab64fdeab2dee76710600d737cd86d31a00cf (diff) | |
| download | vcpkg-0ca3e5b16007355432a833232ec835530bba3d9b.tar.gz vcpkg-0ca3e5b16007355432a833232ec835530bba3d9b.zip | |
Merge pull request #297 from barcharcraz/add_x64_prefix
added x64 as a prefix to search for cl.exe in the toolchain file
| -rw-r--r-- | scripts/buildsystems/vcpkg.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake index 6384de7d3..aafeb531c 100644 --- a/scripts/buildsystems/vcpkg.cmake +++ b/scripts/buildsystems/vcpkg.cmake @@ -14,7 +14,7 @@ if(NOT VCPKG_TOOLCHAIN) set(_VCPKG_TARGET_TRIPLET_ARCH x86) else() find_program(_VCPKG_CL cl) - if(_VCPKG_CL MATCHES "amd64/cl.exe$") + if(_VCPKG_CL MATCHES "amd64/cl.exe$" OR _VCPKG_CL MATCHES "x64/cl.exe$") set(_VCPKG_TARGET_TRIPLET_ARCH x64) elseif(_VCPKG_CL MATCHES "arm/cl.exe$") set(_VCPKG_TARGET_TRIPLET_ARCH arm) |