diff options
| author | Griffin Downs <grdowns@microsoft.com> | 2019-02-28 05:32:29 -0800 |
|---|---|---|
| committer | Griffin Downs <grdowns@microsoft.com> | 2019-02-28 05:32:29 -0800 |
| commit | 21ca74dc420cc2831de95af7cce9931225aaff66 (patch) | |
| tree | f1e7cc954161469c3923102bfd23a74b80c384a2 /ports/dlib/fix-mac-jpeg.patch | |
| parent | c3959c44b997e0795fa472b8fd6bef469198994b (diff) | |
| parent | ddf0043e94395c4cfdb633a5ceaa07d2016500fe (diff) | |
| download | vcpkg-21ca74dc420cc2831de95af7cce9931225aaff66.tar.gz vcpkg-21ca74dc420cc2831de95af7cce9931225aaff66.zip | |
Merge remote-tracking branch 'origin' into dev/grdowns/4217
Diffstat (limited to 'ports/dlib/fix-mac-jpeg.patch')
| -rw-r--r-- | ports/dlib/fix-mac-jpeg.patch | 12 |
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() |