diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2016-10-31 10:11:25 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2016-10-31 10:11:25 -0700 |
| commit | bf16c7f4cc6f51c5e920f16f5b7cdf92cfe4ea67 (patch) | |
| tree | 4322d40f8fdd1958cd853469b4a93ec5c7ca7844 /scripts | |
| parent | 268f5f306ff0aac8d10b31a457fc83f2eb6d09eb (diff) | |
| download | vcpkg-bf16c7f4cc6f51c5e920f16f5b7cdf92cfe4ea67.tar.gz vcpkg-bf16c7f4cc6f51c5e920f16f5b7cdf92cfe4ea67.zip | |
[vcpkg-cmake] Fix regression in Ninja generator support for x86.
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 590b4994a..50b489b1a 100644 --- a/scripts/buildsystems/vcpkg.cmake +++ b/scripts/buildsystems/vcpkg.cmake @@ -18,7 +18,7 @@ if(NOT VCPKG_TOOLCHAIN) set(_VCPKG_TARGET_TRIPLET_ARCH x64) elseif(_VCPKG_CL MATCHES "arm/cl.exe$") 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) else() message(FATAL_ERROR "Unable to determine target architecture.") |