aboutsummaryrefslogtreecommitdiff
path: root/ports
diff options
context:
space:
mode:
authorRobert Schumacher <roschuma@microsoft.com>2017-03-14 17:04:19 -0700
committerGitHub <noreply@github.com>2017-03-14 17:04:19 -0700
commit1a8d15f528dc085d9bbaa9f1fd205c1cf9320fb4 (patch)
tree8bb0607a9a75198e56fc8cd6dae039b41c1a7e09 /ports
parent738d3937f2286a40fc8315a7bb98db7c37fc1ed3 (diff)
parente315b958c738ed71474c00cdf7d1e8779a9910d2 (diff)
downloadvcpkg-1a8d15f528dc085d9bbaa9f1fd205c1cf9320fb4.tar.gz
vcpkg-1a8d15f528dc085d9bbaa9f1fd205c1cf9320fb4.zip
Merge pull request #794 from Mixaill/libjpegturbo-arm
[libjpeg-turbo] fix building on ARM
Diffstat (limited to 'ports')
-rw-r--r--ports/libjpeg-turbo/portfile.cmake8
1 files changed, 7 insertions, 1 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