diff options
| author | Slávek Banko <[email protected]> | 2025-01-13 11:16:03 +0100 |
|---|---|---|
| committer | Slávek Banko <[email protected]> | 2025-01-13 11:16:03 +0100 |
| commit | 57eef5d4f29934eed4d01f830dcfa0707a067f0e (patch) | |
| tree | 7d3cfce76252292b2594a9fdfcb050dbe328d2b6 | |
| parent | a37cbab6de167c4033c6601088135bf7cc3abd0a (diff) | |
| download | libksquirrel-master.tar.gz libksquirrel-master.zip | |
This solves FTBFS with tiff library >= 4.7.0.
Signed-off-by: Slávek Banko <[email protected]>
| -rw-r--r-- | ConfigureChecks.cmake | 5 | ||||
| -rw-r--r-- | kernel/kls_tiff/CMakeLists.txt | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index d8fe7e1..b00bc15 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -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( ) diff --git a/kernel/kls_tiff/CMakeLists.txt b/kernel/kls_tiff/CMakeLists.txt index 855092e..85b2501 100644 --- a/kernel/kls_tiff/CMakeLists.txt +++ b/kernel/kls_tiff/CMakeLists.txt @@ -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 ) |