3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-28 19:25:27 +08:00
Code Issues Projects Releases Wiki Activity

[vcpkg-cmake] Fix regression in Ninja generator support for x86.

Browse Source
This commit is contained in:
Robert Schumacher 2016-10-31 10:11:25 -07:00
parent 268f5f306f
commit bf16c7f4cc
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/buildsystems/vcpkg.cmake
View File

@ -18,7 +18,7 @@ if(NOT VCPKG_TOOLCHAIN)
set(_VCPKG_TARGET_TRIPLET_ARCH x64) set(_VCPKG_TARGET_TRIPLET_ARCH x64)
elseif(_VCPKG_CL MATCHES "arm/cl.exe$") elseif(_VCPKG_CL MATCHES "arm/cl.exe$")
set(_VCPKG_TARGET_TRIPLET_ARCH arm) set(_VCPKG_TARGET_TRIPLET_ARCH arm)
elseif(_VCPKG_CL MATCHES "x86/cl.exe$") elseif(_VCPKG_CL MATCHES "bin/cl.exe$" OR _VCPKG_CL MATCHES "x86/cl.exe$")
set(_VCPKG_TARGET_TRIPLET_ARCH x86) set(_VCPKG_TARGET_TRIPLET_ARCH x86)
else() else()
message(FATAL_ERROR "Unable to determine target architecture.") message(FATAL_ERROR "Unable to determine target architecture.")