From bf16c7f4cc6f51c5e920f16f5b7cdf92cfe4ea67 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Mon, 31 Oct 2016 10:11:25 -0700 Subject: [vcpkg-cmake] Fix regression in Ninja generator support for x86. --- scripts/buildsystems/vcpkg.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts') 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.") -- cgit v1.2.3