diff options
| author | charlie barto <charlie barto> | 2016-11-16 12:38:30 -0500 |
|---|---|---|
| committer | charlie barto <charlie barto> | 2016-11-16 12:38:30 -0500 |
| commit | d56ab64fdeab2dee76710600d737cd86d31a00cf (patch) | |
| tree | deb47cea80e001ee47c021647312cb93d81f222e /scripts | |
| parent | 42df44ca7bba06dfadb6ac7a0e2c7fe611cd6121 (diff) | |
| download | vcpkg-d56ab64fdeab2dee76710600d737cd86d31a00cf.tar.gz vcpkg-d56ab64fdeab2dee76710600d737cd86d31a00cf.zip | |
added x64 as a prefix to search for cl.exe in the toolchain file, this makes things work with VS '15' if you manually specify the triplet
Diffstat (limited to 'scripts')
| -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) |