From 0b54a01149a515e5603bb81d9d89ee9827b6c498 Mon Sep 17 00:00:00 2001 From: kumar8600 Date: Sun, 30 Oct 2016 18:46:24 +0900 Subject: Add cl.exe path based architecture detection for CMake toolchain --- scripts/buildsystems/vcpkg.cmake | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'scripts') diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake index 88acc8436..649e5967a 100644 --- a/scripts/buildsystems/vcpkg.cmake +++ b/scripts/buildsystems/vcpkg.cmake @@ -11,7 +11,14 @@ if(NOT VCPKG_TOOLCHAIN) elseif(CMAKE_GENERATOR MATCHES "^Visual Studio 14 2015 ARM$") set(_VCPKG_TARGET_TRIPLET_ARCH arm) else() - set(_VCPKG_TARGET_TRIPLET_ARCH x86) + find_program(_VCPKG_CL cl) + if(_VCPKG_CL MATCHES "amd64/cl.exe$") + set(_VCPKG_TARGET_TRIPLET_ARCH x64) + elseif(_VCPKG_CL MATCHES "arm/cl.exe$") + set(_VCPKG_TARGET_TRIPLET_ARCH arm) + else() + set(_VCPKG_TARGET_TRIPLET_ARCH x86) + endif() endif() endif() -- cgit v1.2.3