diff options
| author | Sean Warren <s.warren@garvan.org.au> | 2019-05-25 02:39:59 +1000 |
|---|---|---|
| committer | Phil Christensen <philc@microsoft.com> | 2019-05-24 09:39:59 -0700 |
| commit | 65c02123a4b8b99dad2a20013c2b4f29ffb58dbf (patch) | |
| tree | 5d98681ea3d708fafc661e5db3b9e5cb3ffb8755 /ports/dlib/force_finding_packages.patch | |
| parent | e37cc662ee29852f45e85961124f62d91acb488a (diff) | |
| download | vcpkg-65c02123a4b8b99dad2a20013c2b4f29ffb58dbf.tar.gz vcpkg-65c02123a4b8b99dad2a20013c2b4f29ffb58dbf.zip | |
[dlib] Update to v19.17 and fix static lapack linkage (#6520)
* [dlib] Update to v19.17 and fix static lapack linkage
* [dlib] Update patchs for new dlib version
Diffstat (limited to 'ports/dlib/force_finding_packages.patch')
| -rw-r--r-- | ports/dlib/force_finding_packages.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ports/dlib/force_finding_packages.patch b/ports/dlib/force_finding_packages.patch index a62ccf22d..cd8be1607 100644 --- a/ports/dlib/force_finding_packages.patch +++ b/ports/dlib/force_finding_packages.patch @@ -1,8 +1,6 @@ -diff --git a/dlib/CMakeLists.txt b/dlib/CMakeLists.txt -index d8a1362..088168c 100644 --- a/dlib/CMakeLists.txt +++ b/dlib/CMakeLists.txt -@@ -410,68 +410,9 @@ if (NOT TARGET dlib) +@@ -430,70 +430,9 @@ endif() if (DLIB_PNG_SUPPORT) @@ -11,7 +9,7 @@ index d8a1362..088168c 100644 - # Make sure there isn't something wrong with the version of LIBPNG - # installed on this system. Also never link to anything from anaconda - # since it's probably broken. -- if (PNG_FOUND AND NOT ("${PNG_INCLUDE_DIR}" MATCHES "(.*)(Ana|ana|mini)conda(.*)")) +- if (PNG_FOUND AND NOT ("${PNG_INCLUDE_DIR}" MATCHES "(.*)(Ana|ana|mini)conda(.*)") AND NOT BUILDING_PYTHON_IN_MSVC) - set(CMAKE_REQUIRED_LIBRARIES ${PNG_LIBRARIES}) - CHECK_FUNCTION_EXISTS(png_create_read_struct LIBPNG_IS_GOOD) - endif() @@ -23,6 +21,8 @@ index d8a1362..088168c 100644 - # If we can't find libpng then statically compile it in. - include_directories(external/libpng external/zlib) - set(source_files ${source_files} +- external/libpng/arm/arm_init.c +- external/libpng/arm/filter_neon_intrinsics.c - external/libpng/png.c - external/libpng/pngerror.c - external/libpng/pngget.c @@ -74,7 +74,7 @@ index d8a1362..088168c 100644 set(source_files ${source_files} image_loader/png_loader.cpp image_saver/save_png.cpp -@@ -479,68 +420,8 @@ if (NOT TARGET dlib) +@@ -501,68 +440,8 @@ endif() if (DLIB_JPEG_SUPPORT) @@ -83,7 +83,7 @@ index d8a1362..088168c 100644 - # Make sure there isn't something wrong with the version of libjpeg - # installed on this system. Also don't use the installed libjpeg - # if this is an APPLE system because apparently it's broken (as of 2015/01/01). -- if (JPEG_FOUND AND NOT ("${JPEG_INCLUDE_DIR}" MATCHES "(.*)(Ana|ana|mini)conda(.*)")) +- if (JPEG_FOUND AND NOT ("${JPEG_INCLUDE_DIR}" MATCHES "(.*)(Ana|ana|mini)conda(.*)") AND NOT BUILDING_PYTHON_IN_MSVC) - set(CMAKE_REQUIRED_LIBRARIES ${JPEG_LIBRARY}) - CHECK_FUNCTION_EXISTS(jpeg_read_header LIBJPEG_IS_GOOD) - endif() |