ericLemanissier/conan-center-index
1
0
Fork 1
mirror of https://github.com/conan-io/conan-center-index.git synced 2025-08-15 02:58:22 +00:00
Code Issues 6 Packages Projects Releases Wiki Activity

(#14721) libtiff: bump libdeflate

Browse Source 
* bump libdeflate

* back to self.options in validate()
This commit is contained in:
SpaceIm
2022-12-14 12:45:25 +01:00
committed by GitHub
parent e187a925f7
commit f2ecff811b
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
recipes/libtiff/all/conanfile.py
View File

@@ -82,7 +82,7 @@ class LibtiffConan(ConanFile):
if self.options.zlib:
self.requires("zlib/1.2.13")
if self.options.get_safe("libdeflate"):
self.requires("libdeflate/1.12")
self.requires("libdeflate/1.15")
if self.options.lzma:
self.requires("xz_utils/5.2.5")
if self.options.jpeg == "libjpeg":
@@ -97,7 +97,7 @@ class LibtiffConan(ConanFile):
self.requires("libwebp/1.2.4")
def validate(self):
if self.info.options.get_safe("libdeflate") and not self.info.options.zlib:
if self.options.get_safe("libdeflate") and not self.options.zlib:
raise ConanInvalidConfiguration("libtiff:libdeflate=True requires libtiff:zlib=True")
def source(self):

2
recipes/libtiff/all/patches/4.2.0-0001-cmake-dependencies.patch
View File

@@ -12,7 +12,7 @@
+ if (1)
set(DEFLATE_FOUND 1)
- set(DEFLATE_LIBRARIES ${DEFLATE_LIBRARY})
+ set(DEFLATE_LIBRARIES libdeflate::libdeflate)
+ set(DEFLATE_LIBRARIES $<IF:$<TARGET_EXISTS:libdeflate::libdeflate>,libdeflate::libdeflate,libdeflate::libdeflate_static>)
endif()
endif()
set(LIBDEFLATE_SUPPORT FALSE)

2
recipes/libtiff/all/patches/4.3.0-0001-cmake-dependencies.patch
View File

@@ -63,7 +63,7 @@
endif()
if(ZIP_SUPPORT AND LIBDEFLATE_SUPPORT)
- target_link_libraries(tiff PRIVATE Deflate::Deflate)
+ target_link_libraries(tiff PRIVATE libdeflate::libdeflate)
+ target_link_libraries(tiff PRIVATE $<IF:$<TARGET_EXISTS:libdeflate::libdeflate>,libdeflate::libdeflate,libdeflate::libdeflate_static>)
endif()
if(JPEG_SUPPORT)
target_link_libraries(tiff PRIVATE JPEG::JPEG)

2
recipes/libtiff/all/patches/4.4.0-0001-cmake-dependencies.patch
View File

@@ -63,7 +63,7 @@
endif()
if(ZIP_SUPPORT AND LIBDEFLATE_SUPPORT)
- target_link_libraries(tiff PRIVATE Deflate::Deflate)
+ target_link_libraries(tiff PRIVATE libdeflate::libdeflate)
+ target_link_libraries(tiff PRIVATE $<IF:$<TARGET_EXISTS:libdeflate::libdeflate>,libdeflate::libdeflate,libdeflate::libdeflate_static>)
list(APPEND tiff_libs_private_list "${Deflate_LIBRARY}")
endif()
if(JPEG_SUPPORT)