diff options
| author | Slávek Banko <[email protected]> | 2025-01-12 21:45:04 +0100 |
|---|---|---|
| committer | Slávek Banko <[email protected]> | 2025-01-13 02:59:32 +0100 |
| commit | 62c5d8c7b4c5b5215d0e63c86d43f7c517d0637a (patch) | |
| tree | 60ef026ec2a75712b2ce6acce1ea0d1c46918a81 | |
| parent | 7ad6828377821fa26671be99f9dbb3600cf12fa9 (diff) | |
| download | tdelibs-62c5d8c7b4c5b5215d0e63c86d43f7c517d0637a.tar.gz tdelibs-62c5d8c7b4c5b5215d0e63c86d43f7c517d0637a.zip | |
Prefer to use pkg-config to detect tiff library.
This solves FTBFS with tiff library >= 4.7.0.
This resolves issue TDE/tde-packaging#385.
Signed-off-by: Slávek Banko <[email protected]>
(cherry picked from commit 180ceca8bb26bbe97f60c99e5d172eb8ccd66e6d)
| -rw-r--r-- | CMakeLists.txt | 5 | ||||
| -rw-r--r-- | kimgio/CMakeLists.txt | 1 |
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} ) |