Last active
May 5, 2020 16:36
-
-
Save 1480c1/56d6c645b324d831f594318d504ad1af to your computer and use it in GitHub Desktop.
webp
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
From 65159a62dceab92c794dbf8ef3746b6c1702553d Mon Sep 17 00:00:00 2001 | |
From: cddeg <cddeg@CCOM-LAPTOP2> | |
Date: Sat, 9 Nov 2019 12:04:53 -0500 | |
Subject: [PATCH] CMake deps: order tiff,jpeg,png,zlib,lzma, and then zstd | |
Signed-off-by: cddeg <cddeg@CCOM-LAPTOP2> | |
--- | |
cmake/deps.cmake | 8 +++++++- | |
1 file changed, 7 insertions(+), 1 deletion(-) | |
diff --git a/cmake/deps.cmake b/cmake/deps.cmake | |
index f19c0378..4b7f43fe 100644 | |
--- a/cmake/deps.cmake | |
+++ b/cmake/deps.cmake | |
@@ -63,7 +63,7 @@ endif() | |
# Find the standard image libraries. | |
set(WEBP_DEP_IMG_LIBRARIES) | |
set(WEBP_DEP_IMG_INCLUDE_DIRS) | |
-foreach(I_LIB PNG JPEG TIFF) | |
+foreach(I_LIB TIFF JPEG PNG ZLIB LibLZMA) | |
find_package(${I_LIB}) | |
set(WEBP_HAVE_${I_LIB} ${${I_LIB}_FOUND}) | |
if(${I_LIB}_FOUND) | |
@@ -72,6 +72,12 @@ foreach(I_LIB PNG JPEG TIFF) | |
${${I_LIB}_INCLUDE_DIRS}) | |
endif() | |
endforeach() | |
+if(WEBP_HAVE_TIFF) | |
+ find_library(zstd_lib zstd) | |
+ if(zstd_lib) | |
+ list(APPEND WEBP_DEP_IMG_LIBRARIES ${zstd_lib}) | |
+ endif() | |
+endif() | |
if(WEBP_DEP_IMG_INCLUDE_DIRS) | |
list(REMOVE_DUPLICATES WEBP_DEP_IMG_INCLUDE_DIRS) | |
endif() | |
-- | |
2.23.0 | |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment