diff options
Diffstat (limited to 'ConfigureChecks.cmake')
| -rw-r--r-- | ConfigureChecks.cmake | 20 |
1 files changed, 18 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( ) |