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 | |
| 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
| -rw-r--r-- | ports/libjpeg-turbo/portfile.cmake | 8 | ||||
| -rw-r--r-- | scripts/cmake/vcpkg_configure_cmake.cmake | 8 | ||||
| -rw-r--r-- | triplets/arm-uwp.cmake | 1 | ||||
| -rw-r--r-- | triplets/x64-uwp.cmake | 1 | ||||
| -rw-r--r-- | triplets/x86-uwp.cmake | 1 |
5 files changed, 11 insertions, 8 deletions
diff --git a/ports/libjpeg-turbo/portfile.cmake b/ports/libjpeg-turbo/portfile.cmake index 6c30c0a08..995e8e0ee 100644 --- a/ports/libjpeg-turbo/portfile.cmake +++ b/ports/libjpeg-turbo/portfile.cmake @@ -28,18 +28,24 @@ else() set(NOT_BUILD_STATIC OFF) endif() +if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") + set(LIBJPEGTURBO_SIMD -DWITH_SIMD=OFF) +endif() + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA OPTIONS -DENABLE_STATIC=${BUILD_STATIC} -DENABLE_SHARED=${NOT_BUILD_STATIC} -DWITH_CRT_DLL=ON -DENABLE_EXECUTABLES=OFF -DINSTALL_DOCS=OFF - # OPTIONS_RELEASE -DOPTIMIZE=1 + ${LIBJPEGTURBO_SIMD} OPTIONS_DEBUG -DINSTALL_HEADERS=OFF ) +vcpkg_build_cmake() vcpkg_install_cmake() # Rename libraries for static builds diff --git a/scripts/cmake/vcpkg_configure_cmake.cmake b/scripts/cmake/vcpkg_configure_cmake.cmake index daf9dfd6f..e3ca3adca 100644 --- a/scripts/cmake/vcpkg_configure_cmake.cmake +++ b/scripts/cmake/vcpkg_configure_cmake.cmake @@ -19,8 +19,8 @@ function(vcpkg_configure_cmake) set(GENERATOR "Visual Studio 14 2015") elseif(TRIPLET_SYSTEM_ARCH MATCHES "x64" AND VCPKG_PLATFORM_TOOLSET MATCHES "v140") set(GENERATOR "Visual Studio 14 2015 Win64") - elseif(TRIPLET_SYSTEM_ARCH MATCHES "arm") - set(GENERATOR "Visual Studio 14 2015 ARM" AND VCPKG_PLATFORM_TOOLSET MATCHES "v140") + elseif(TRIPLET_SYSTEM_ARCH MATCHES "arm" AND VCPKG_PLATFORM_TOOLSET MATCHES "v140") + set(GENERATOR "Visual Studio 14 2015 ARM") elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" AND TRIPLET_SYSTEM_ARCH MATCHES "x86" AND VCPKG_PLATFORM_TOOLSET MATCHES "v141") set(GENERATOR "Visual Studio 15 2017") @@ -32,8 +32,8 @@ function(vcpkg_configure_cmake) set(GENERATOR "Visual Studio 15 2017") elseif(TRIPLET_SYSTEM_ARCH MATCHES "x64" AND VCPKG_PLATFORM_TOOLSET MATCHES "v141") set(GENERATOR "Visual Studio 15 2017 Win64") - elseif(TRIPLET_SYSTEM_ARCH MATCHES "arm") - set(GENERATOR "Visual Studio 15 2017 ARM" AND VCPKG_PLATFORM_TOOLSET MATCHES "v141") + elseif(TRIPLET_SYSTEM_ARCH MATCHES "arm" AND VCPKG_PLATFORM_TOOLSET MATCHES "v141") + set(GENERATOR "Visual Studio 15 2017 ARM") endif() # If we use Ninja, make sure it's on PATH 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") |