diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-03-14 17:04:19 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-14 17:04:19 -0700 |
| commit | 1a8d15f528dc085d9bbaa9f1fd205c1cf9320fb4 (patch) | |
| tree | 8bb0607a9a75198e56fc8cd6dae039b41c1a7e09 /triplets | |
| parent | 738d3937f2286a40fc8315a7bb98db7c37fc1ed3 (diff) | |
| parent | e315b958c738ed71474c00cdf7d1e8779a9910d2 (diff) | |
| download | vcpkg-1a8d15f528dc085d9bbaa9f1fd205c1cf9320fb4.tar.gz vcpkg-1a8d15f528dc085d9bbaa9f1fd205c1cf9320fb4.zip | |
Merge pull request #794 from Mixaill/libjpegturbo-arm
[libjpeg-turbo] fix building on ARM
Diffstat (limited to 'triplets')
| -rw-r--r-- | triplets/arm-uwp.cmake | 1 | ||||
| -rw-r--r-- | triplets/x64-uwp.cmake | 1 | ||||
| -rw-r--r-- | triplets/x86-uwp.cmake | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/triplets/arm-uwp.cmake b/triplets/arm-uwp.cmake index 678643eb1..f16f96a4a 100644 --- a/triplets/arm-uwp.cmake +++ b/triplets/arm-uwp.cmake @@ -4,4 +4,3 @@ set(VCPKG_LIBRARY_LINKAGE dynamic) set(VCPKG_CMAKE_SYSTEM_NAME WindowsStore) set(VCPKG_CMAKE_SYSTEM_VERSION 10.0) -set(VCPKG_REQUIRE_GENERATOR "Visual Studio 14 2015 Win64") diff --git a/triplets/x64-uwp.cmake b/triplets/x64-uwp.cmake index ca6455fc8..944acdd83 100644 --- a/triplets/x64-uwp.cmake +++ b/triplets/x64-uwp.cmake @@ -4,4 +4,3 @@ set(VCPKG_LIBRARY_LINKAGE dynamic) set(VCPKG_CMAKE_SYSTEM_NAME WindowsStore) set(VCPKG_CMAKE_SYSTEM_VERSION 10.0) -set(VCPKG_REQUIRE_GENERATOR "Visual Studio 14 2015 Win64") diff --git a/triplets/x86-uwp.cmake b/triplets/x86-uwp.cmake index 7e2d4d2c0..13b9d77c2 100644 --- a/triplets/x86-uwp.cmake +++ b/triplets/x86-uwp.cmake @@ -4,4 +4,3 @@ set(VCPKG_LIBRARY_LINKAGE dynamic) set(VCPKG_CMAKE_SYSTEM_NAME WindowsStore) set(VCPKG_CMAKE_SYSTEM_VERSION 10.0) -set(VCPKG_REQUIRE_GENERATOR "Visual Studio 14 2015 Win64") |