diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2016-10-31 09:37:13 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2016-10-31 09:37:13 -0700 |
| commit | 956f3b110ba2826899c97ab28dafc04ca36b4b20 (patch) | |
| tree | 3600e843834bf1dd6c47e854ad292b452cdbc62d /scripts | |
| parent | 0b54a01149a515e5603bb81d9d89ee9827b6c498 (diff) | |
| download | vcpkg-956f3b110ba2826899c97ab28dafc04ca36b4b20.tar.gz vcpkg-956f3b110ba2826899c97ab28dafc04ca36b4b20.zip | |
[vcpkg-cmake] Added slightly more error checking
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/buildsystems/vcpkg.cmake | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake index 649e5967a..590b4994a 100644 --- a/scripts/buildsystems/vcpkg.cmake +++ b/scripts/buildsystems/vcpkg.cmake @@ -10,14 +10,18 @@ if(NOT VCPKG_TOOLCHAIN) set(_VCPKG_TARGET_TRIPLET_ARCH x64) elseif(CMAKE_GENERATOR MATCHES "^Visual Studio 14 2015 ARM$") set(_VCPKG_TARGET_TRIPLET_ARCH arm) + elseif(CMAKE_GENERATOR MATCHES "^Visual Studio 14 2015$") + set(_VCPKG_TARGET_TRIPLET_ARCH x86) else() 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() + elseif(_VCPKG_CL MATCHES "x86/cl.exe$") set(_VCPKG_TARGET_TRIPLET_ARCH x86) + else() + message(FATAL_ERROR "Unable to determine target architecture.") endif() endif() endif() |