summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2025-01-12 21:45:04 +0100
committerSlávek Banko <slavek.banko@axis.cz>2025-01-12 21:45:04 +0100
commit180ceca8bb26bbe97f60c99e5d172eb8ccd66e6d (patch)
tree3d7335a15b7d12c86a0e5485c8eadbc6aca2562d
parent8ee06ec529e375693eaefa6fb68dc496d36fd367 (diff)
downloadtdelibs-180ceca8bb26bbe97f60c99e5d172eb8ccd66e6d.tar.gz
tdelibs-180ceca8bb26bbe97f60c99e5d172eb8ccd66e6d.zip
Prefer to use pkg-config to detect tiff library.HEADmaster
This solves FTBFS with tiff library >= 4.7.0. This resolves issue TDE/tde-packaging#385. Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
-rw-r--r--CMakeLists.txt5
-rw-r--r--kimgio/CMakeLists.txt1
2 files changed, 5 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2d6f11106..1628a580d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -854,7 +854,10 @@ set( HAVE_LIBPNG 1 )
##### check for tiff ############################
if( WITH_TIFF )
- find_package( TIFF )
+ pkg_search_module( TIFF libtiff-4 )
+ if( NOT TIFF_FOUND )
+ find_package( TIFF )
+ endif( NOT TIFF_FOUND )
if( NOT TIFF_FOUND )
message(FATAL_ERROR "\ntiff are requested, but not found on your system" )
endif( NOT TIFF_FOUND )
diff --git a/kimgio/CMakeLists.txt b/kimgio/CMakeLists.txt
index cd013e588..0e588bcce 100644
--- a/kimgio/CMakeLists.txt
+++ b/kimgio/CMakeLists.txt
@@ -20,6 +20,7 @@ include_directories(
link_directories(
${TDECORE_LIBRARY_DIRS}
+ ${TIFF_LIBRARY_DIRS}
)