diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2023-10-23 04:04:09 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2023-10-23 07:14:07 +0200 |
| commit | bdbed63f2ade1c0f999a11b1d61425a8b1760e52 (patch) | |
| tree | f4c554f5454cf3ea2aae31cf2f547ea505b5d63c | |
| parent | d4e96a34a58f9866c1f674ee89f1dc2397f0d27a (diff) | |
| download | libksquirrel-r14.1.1.tar.gz libksquirrel-r14.1.1.zip | |
cmake: Add detection of standalone iconv library.r14.1.1
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit e0827ea544d475622ed6b7a10e201fd93cae4251)
| -rw-r--r-- | ConfigureChecks.cmake | 20 | ||||
| -rw-r--r-- | kernel/kls_xcf/xcf2pnm/CMakeLists.txt | 1 |
2 files changed, 19 insertions, 2 deletions
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index 5914777..d8fe7e1 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -337,9 +337,25 @@ if( BUILD_XCF ) check_include_file( "iconv.h" HAVE_ICONV_H ) if( NOT HAVE_ICONV_H ) - tde_message_fatal( "xcf codec was requested but libiconv not found on your system" ) + tde_message_fatal( "xcf codec was requested but iconv header not found on your system" ) endif( ) - set( HAVE_ICONV 1 ) + + message( STATUS "Check for standalone libiconv" ) + find_library( HAVE_LIBICONV iconv ) + if( HAVE_LIBICONV ) + set( ICONV_LIBRARIES iconv ) + message( STATUS "Check for standalone libiconv - found" ) + else( ) + set( ICONV_LIBRARIES "" ) + message( STATUS "Check for standalone libiconv - not found" ) + endif( ) + + tde_save_and_set( CMAKE_REQUIRED_LIBRARIES "${ICONV_LIBRARIES}" ) + check_function_exists( "iconv_open" HAVE_ICONV ) + tde_restore( CMAKE_REQUIRED_LIBRARIES ) + if( NOT HAVE_ICONV ) + tde_message_fatal( "xcf codec was requested but iconv library not found on your system" ) + endif() endif( ) diff --git a/kernel/kls_xcf/xcf2pnm/CMakeLists.txt b/kernel/kls_xcf/xcf2pnm/CMakeLists.txt index 5edc991..a38e7d1 100644 --- a/kernel/kls_xcf/xcf2pnm/CMakeLists.txt +++ b/kernel/kls_xcf/xcf2pnm/CMakeLists.txt @@ -10,5 +10,6 @@ include_directories( file( GLOB _bin_c_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/*.c ) tde_add_executable( ksquirrel-libs-xcf2pnm SOURCES ${_bin_c_files} + LINK ${ICONV_LIBRARIES} DESTINATION ${BIN_INSTALL_DIR} ) |