aboutsummaryrefslogtreecommitdiff
path: root/ports/dlib/fix-mac-jpeg.patch
diff options
context:
space:
mode:
authorPhil Christensen <philc@microsoft.com>2019-02-28 14:36:23 -0800
committerPhil Christensen <philc@microsoft.com>2019-02-28 14:36:23 -0800
commit773c8267dfb506f41c204f61042f30b6143a8095 (patch)
tree5946d1526c3ad77a2df80786a1370d96389d931b /ports/dlib/fix-mac-jpeg.patch
parent6afbceb27fd2aa39c66f810a22f5d4ad97575110 (diff)
parent7859944528be28bee1fda9f325b78d6a7f02124e (diff)
downloadvcpkg-773c8267dfb506f41c204f61042f30b6143a8095.tar.gz
vcpkg-773c8267dfb506f41c204f61042f30b6143a8095.zip
Merge branch 'master' of https://github.com/microsoft/vcpkg into dev/philc/4564
Diffstat (limited to 'ports/dlib/fix-mac-jpeg.patch')
-rw-r--r--ports/dlib/fix-mac-jpeg.patch12
1 files changed, 12 insertions, 0 deletions
diff --git a/ports/dlib/fix-mac-jpeg.patch b/ports/dlib/fix-mac-jpeg.patch
new file mode 100644
index 000000000..5f961264b
--- /dev/null
+++ b/ports/dlib/fix-mac-jpeg.patch
@@ -0,0 +1,12 @@
+diff --git a/dlib/CMakeLists.txt b/dlib/CMakeLists.txt
+--- a/dlib/CMakeLists.txt
++++ b/dlib/CMakeLists.txt
+@@ -480,7 +480,7 @@
+ set(CMAKE_REQUIRED_LIBRARIES ${JPEG_LIBRARY})
+ CHECK_FUNCTION_EXISTS(jpeg_read_header LIBJPEG_IS_GOOD)
+ endif()
+- if (JPEG_FOUND AND LIBJPEG_IS_GOOD AND NOT APPLE)
++ if (JPEG_FOUND AND LIBJPEG_IS_GOOD)
+ include_directories(${JPEG_INCLUDE_DIR})
+ set (dlib_needed_libraries ${dlib_needed_libraries} ${JPEG_LIBRARY})
+ else()