diff options
| author | kumar8600 <kumar8600@gmail.com> | 2016-10-30 18:46:24 +0900 |
|---|---|---|
| committer | kumar8600 <kumar8600@gmail.com> | 2016-10-30 18:46:24 +0900 |
| commit | 0b54a01149a515e5603bb81d9d89ee9827b6c498 (patch) | |
| tree | 8cc509f76c07bf476e36e462f2aa3102a21ec8f6 /scripts | |
| parent | 2efbe4ec6f211326c395f2b0a075de2ce07a2d4a (diff) | |
| download | vcpkg-0b54a01149a515e5603bb81d9d89ee9827b6c498.tar.gz vcpkg-0b54a01149a515e5603bb81d9d89ee9827b6c498.zip | |
Add cl.exe path based architecture detection for CMake toolchain
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/buildsystems/vcpkg.cmake | 9 |
1 files changed, 8 insertions, 1 deletions
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() |