From eb0fabd7da92d5147be5c86b204f6271a68e41e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Tue, 19 Feb 2019 02:58:15 +0100 Subject: [PATCH] Fix build with standalone libiconv. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko --- ConfigureChecks.cmake | 13 +++++++++++++ src/CMakeLists.txt | 3 ++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index fa91474..ad8bddc 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -49,3 +49,16 @@ if( LIBYAZ_FOUND ) else() tde_message_fatal( "libyaz is required, but was not found on your system" ) endif( ) + + +##### check for libiconv + +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/src/CMakeLists.txt b/src/CMakeLists.txt index a9c1ce3..bf18877 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -91,11 +91,12 @@ tde_add_kpart( libkbibtexpart AUTOMOC tdeutils-shared katepartinterfaces-shared tdetexteditor + ${ICONV_LIBRARIES} ${LIBXML2_LIBRARIES} ${LIBXSLT_LIBRARIES} ${LIBXSLT_EXSLT_LIBRARIES} ${LIBYAZ_LIBRARIES} - + DESTINATION ${PLUGIN_INSTALL_DIR} )