diff options
| -rw-r--r-- | ConfigureChecks.cmake | 17 | ||||
| -rw-r--r-- | zlibrary/core/CMakeLists.txt | 2 |
2 files changed, 18 insertions, 1 deletions
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index 478f610..0faaecb 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -68,3 +68,20 @@ pkg_search_module( UNIBREAK libunibreak ) if( NOT UNIBREAK_FOUND ) tde_message_fatal( "unibreak is required, but not found on your system" ) endif( ) + + +##### check for standalone iconv library +check_include_file( "iconv.h" HAVE_ICONV_H ) +if( NOT HAVE_ICONV_H ) + tde_message_fatal( "iconv header is required, but not found on your system" ) +endif( ) + +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( ) diff --git a/zlibrary/core/CMakeLists.txt b/zlibrary/core/CMakeLists.txt index f81eb83..ad9e656 100644 --- a/zlibrary/core/CMakeLists.txt +++ b/zlibrary/core/CMakeLists.txt @@ -17,7 +17,7 @@ configure_file( include/core_export.h.cmake include/core_export.h ) file( GLOB_RECURSE _zlcore_cpp_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.cpp) tde_add_library( zlcore-tqt SHARED AUTOMOC SOURCES ${_zlcore_cpp_files} - LINK ${ZLIB_LIBRARIES} ${BZIP2_LIBRARIES} ${EXPAT_LIBRARIES} ${TQT_LIBRARIES} + LINK ${ZLIB_LIBRARIES} ${BZIP2_LIBRARIES} ${EXPAT_LIBRARIES} ${ICONV_LIBRARIES} ${TQT_LIBRARIES} VERSION 0.99.4 DESTINATION ${ZL_LIB_INSTALL_DIR} ) |