commit c7bfa7d34197f366c1440509f889044869bd8676
Author: Georg Baum <[email protected]>
Date:   Sun Jul 3 18:51:22 2016 +0200

    Fix linking with cmake and included iconv
    
    Previously, the GNU linker would complain about missing libcharset_relocate.
    The MSVC linker did not complain, since the code that uses 
libcharset_relocate
    does not seem to be sued, so it removed it.
---
 3rdparty/libiconv/CMakeLists.txt |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/3rdparty/libiconv/CMakeLists.txt b/3rdparty/libiconv/CMakeLists.txt
index e1c6e2c..210d0c2 100644
--- a/3rdparty/libiconv/CMakeLists.txt
+++ b/3rdparty/libiconv/CMakeLists.txt
@@ -45,7 +45,7 @@ 
add_definitions(-Dset_relocation_prefix=libcharset_set_relocation_prefix -Dreloc
 set(SRC_LIBCHARSET ${SRCDIR}/libcharset/lib/localcharset.c)
 
 # libiconv
-set(SRC_LIBICONV ${SRCDIR}/lib/iconv.c)
+set(SRC_LIBICONV ${SRCDIR}/lib/iconv.c ${SRCDIR}/lib/relocatable.c)
 
 add_library(iconv ${SRC_LIBICONV} ${SRC_LIBCHARSET})
 set_target_properties(iconv PROPERTIES COMPILE_FLAGS -DBUILDING_LIBICONV)

Reply via email to