From 995763a316522e8d211290dfb7068b6c188c5dd7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milo=C5=A1=20Komar=C4=8Devi=C4=87?=
<miloskomarcevic@aim.com>
Date: Mon, 25 Sep 2023 13:30:18 +0000
Subject: [PATCH] CMake: move libdeflate and Lerc to Requires.private
---
libtiff/CMakeLists.txt | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/libtiff/CMakeLists.txt b/libtiff/CMakeLists.txt
index c2da6841..4caa881d 100755
--- a/libtiff/CMakeLists.txt
+++ b/libtiff/CMakeLists.txt
@@ -130,7 +130,11 @@ if(ZIP_SUPPORT)
endif()
if(ZIP_SUPPORT AND LIBDEFLATE_SUPPORT)
target_link_libraries(tiff PRIVATE Deflate::Deflate)
- list(APPEND tiff_libs_private_list "${Deflate_LIBRARY}")
+ if(Deflate_VERSION_STRING VERSION_GREATER_EQUAL "1.9")
+ string(APPEND tiff_requires_private " libdeflate")
+ else()
+ list(APPEND tiff_libs_private_list "${Deflate_LIBRARY}")
+ endif()
endif()
if(JPEG_SUPPORT)
target_link_libraries(tiff PRIVATE JPEG::JPEG)
@@ -148,9 +152,13 @@ if(JBIG_SUPPORT)
endif()
if(LERC_SUPPORT)
target_link_libraries(tiff PRIVATE LERC::LERC)
- list(APPEND tiff_libs_private_list "${LERC_LIBRARY}")
- if(NOT BUILD_SHARED_LIBS)
- set_target_properties(tiff PROPERTIES COMPILE_DEFINITIONS LERC_STATIC)
+ if(LERC_VERSION_STRING VERSION_GREATER_EQUAL "4.0")
+ if(NOT BUILD_SHARED_LIBS)
+ set_target_properties(tiff PROPERTIES COMPILE_DEFINITIONS LERC_STATIC)
+ endif()
+ string(APPEND tiff_requires_private " Lerc")
+ else()
+ list(APPEND tiff_libs_private_list "${LERC_LIBRARY}")
endif()
endif()
if(LZMA_SUPPORT)