diff options
| author | Phoebe <20694052+PhoebeHui@users.noreply.github.com> | 2020-10-22 08:42:47 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-21 17:42:47 -0700 |
| commit | aff62d3487cd4c47ebc7f1dfd7a7023665403e20 (patch) | |
| tree | 8c5f01eec304a94ceea346ab546882b8ac8efb51 /ports/leptonica/fix-find-libwebp.patch | |
| parent | b1dea7104f38eae95284470af2833b628a4847bb (diff) | |
| download | vcpkg-aff62d3487cd4c47ebc7f1dfd7a7023665403e20.tar.gz vcpkg-aff62d3487cd4c47ebc7f1dfd7a7023665403e20.zip | |
[leptonica] Update to 1.80.0 (#14125)
Diffstat (limited to 'ports/leptonica/fix-find-libwebp.patch')
| -rw-r--r-- | ports/leptonica/fix-find-libwebp.patch | 41 |
1 files changed, 27 insertions, 14 deletions
diff --git a/ports/leptonica/fix-find-libwebp.patch b/ports/leptonica/fix-find-libwebp.patch index 636bf655f..588cf0c54 100644 --- a/ports/leptonica/fix-find-libwebp.patch +++ b/ports/leptonica/fix-find-libwebp.patch @@ -1,14 +1,27 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index debc232..2aa2d3a 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -60,8 +60,7 @@ if(NOT EXISTS ${PROJECT_SOURCE_DIR}/.cppan) - endif() - if(NOT WEBP) - message(STATUS "Looking for WEBP") -- find_path(WEBP_INCLUDE_DIR /webp/decode.h) -- find_library(WEBP_LIBRARY NAMES webp) -+ find_package(WebP CONFIG REQUIRED) - if (WEBP_INCLUDE_DIR AND WEBP_LIBRARY) - set(WEBP 1) - set(WEBP_FOUND TRUE) +diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 6535632..1740841 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -70,8 +70,7 @@ if(NOT SW_BUILD)
+ pkg_check_modules(JP2K libopenjp2>=2.0 QUIET)
+ endif()
+ if(NOT WEBP)
+- find_path(WEBP_INCLUDE_DIR /webp/decode.h)
+- find_library(WEBP_LIBRARY NAMES webp)
++ find_package(WebP CONFIG REQUIRED)
+ if (WEBP_INCLUDE_DIR AND WEBP_LIBRARY)
+ set(WEBP 1)
+ set(WEBP_FOUND TRUE)
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index d2b999d..019ec7b 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -52,7 +52,7 @@ if (TIFF_LIBRARIES)
+ endif()
+ if (WEBP_FOUND)
+ target_include_directories (leptonica PUBLIC ${WEBP_INCLUDE_DIRS})
+- target_link_libraries (leptonica ${WEBP_LIBRARIES})
++ target_link_libraries (leptonica WebP::webp WebP::libwebpmux)
+ endif()
+ if (ZLIB_LIBRARIES)
+ target_include_directories (leptonica PUBLIC ${ZLIB_INCLUDE_DIRS})
|