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 57eef5d4f2)
r14.1.x
Slávek Banko 1 month ago
parent 906c59e625
commit f5b49a52fc
No known key found for this signature in database
GPG Key ID: 608F5293A04BE668

@ -241,7 +241,10 @@ endif( )
##### checks for tiff codec #####
if( BUILD_TIFF )
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 was requested but not found on your system" )
endif( )

@ -4,6 +4,9 @@ include_directories(
${CMAKE_BINARY_DIR}
)
link_directories(
${TIFF_LIBRARY_DIRS}
)
add_definitions(
-DTIFF_UI="${SHARE_INSTALL_PREFIX}/ksquirrel-libs/libkls_tiff.so.ui"
@ -14,7 +17,7 @@ add_definitions(
tde_add_library( kls_tiff SHARED AUTOMOC
SOURCES fmt_codec_tiff.cpp
LINK ksquirrel-libs-shared ${TIFF_LIBRARY}
LINK ksquirrel-libs-shared ${TIFF_LIBRARIES}
VERSION 0.8.0
DESTINATION ${LIB_INSTALL_DIR}/ksquirrel-libs
)

Loading…
Cancel
Save