diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2025-01-13 11:45:25 +0100 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2025-01-13 17:00:30 +0100 |
| commit | e88dde8383527fb937e87654bbf496f0f81691f9 (patch) | |
| tree | dc3b3206b36f5a91ca5fbefc527c27c78bfd3850 | |
| parent | fc683aa2e0c351ad4d03fec511140415a519c5c4 (diff) | |
| download | digikam-e88dde8383527fb937e87654bbf496f0f81691f9.tar.gz digikam-e88dde8383527fb937e87654bbf496f0f81691f9.zip | |
Prefer to use pkg-config to detect tiff library.
This solves FTBFS with tiff library >= 4.7.0.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit db8b48484080c073c32b8477234bb07efc3ec510)
| -rw-r--r-- | ConfigureChecks.cmake | 5 | ||||
| -rw-r--r-- | src/libs/dimg/loaders/CMakeLists.txt | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index 9fa91c17..482187b2 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -124,7 +124,10 @@ endif() ##### checks for libtiff -find_package( TIFF ) +pkg_search_module( TIFF libtiff-4 ) +if( NOT TIFF_FOUND ) + find_package( TIFF ) +endif( ) if( NOT TIFF_FOUND ) tde_message_fatal( "libtiff is required but not found on your system" ) endif( ) diff --git a/src/libs/dimg/loaders/CMakeLists.txt b/src/libs/dimg/loaders/CMakeLists.txt index e880e579..6e47d86a 100644 --- a/src/libs/dimg/loaders/CMakeLists.txt +++ b/src/libs/dimg/loaders/CMakeLists.txt @@ -6,6 +6,10 @@ include_directories( ${CMAKE_SOURCE_DIR}/src/libs/whitebalance ) +link_directories( + ${TIFF_LIBRARY_DIRS} +) + ##### dimgloaders library (static) |