diff options
| author | Charlie Barto <bartoc@umich.edu> | 2016-11-19 01:33:31 -0500 |
|---|---|---|
| committer | Charlie Barto <bartoc@umich.edu> | 2016-11-19 01:33:31 -0500 |
| commit | 447160a19e8881d46b7e77ad8893f6445c3c74f2 (patch) | |
| tree | 50a580a7f7f2da08cd10b032e9131e5e6bffa0b0 /scripts | |
| parent | a7af1a727ea2631f7ba7373f6f0c8336881a3dde (diff) | |
| download | vcpkg-447160a19e8881d46b7e77ad8893f6445c3c74f2.tar.gz vcpkg-447160a19e8881d46b7e77ad8893f6445c3c74f2.zip | |
add support for VS 2017
Diffstat (limited to 'scripts')
| -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$") |