diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2016-11-21 10:47:24 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-21 10:47:24 -0800 |
| commit | b68f3309760265bb01d75d2b6c4b0277e13c1490 (patch) | |
| tree | ab5e3953cbe81c6a36291c3ef815758b603df4ae | |
| parent | b706e4b93a23fa26580eea3089226e9ff0fc85e4 (diff) | |
| parent | 447160a19e8881d46b7e77ad8893f6445c3c74f2 (diff) | |
| download | vcpkg-b68f3309760265bb01d75d2b6c4b0277e13c1490.tar.gz vcpkg-b68f3309760265bb01d75d2b6c4b0277e13c1490.zip | |
Merge pull request #307 from barcharcraz/vs2017fix
add support for VS 2017
| -rw-r--r-- | scripts/buildsystems/vcpkg.cmake | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake index aafeb531c..54960a138 100644 --- a/scripts/buildsystems/vcpkg.cmake +++ b/scripts/buildsystems/vcpkg.cmake @@ -12,6 +12,12 @@ if(NOT VCPKG_TOOLCHAIN) set(_VCPKG_TARGET_TRIPLET_ARCH arm) elseif(CMAKE_GENERATOR MATCHES "^Visual Studio 14 2015$") set(_VCPKG_TARGET_TRIPLET_ARCH x86) + elseif(CMAKE_GENERATOR MATCHES "^Visual Studio 15 2017 Win64$") + set(_VCPKG_TARGET_TRIPLET_ARCH x64) + elseif(CMAKE_GENERATOR MATCHES "^Visual Studio 15 2017 ARM") + set(_VCPKG_TARGET_TRIPLET_ARCH arm) + elseif(CMAKE_GENERATOR MATCHES "^Visual Studio 15 2017") + set(_VCPKG_TARGET_TRIPLET_ARCH x86) else() find_program(_VCPKG_CL cl) if(_VCPKG_CL MATCHES "amd64/cl.exe$" OR _VCPKG_CL MATCHES "x64/cl.exe$") |