anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 01:59:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix linking with cmake and included iconv

Browse Source 
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.
This commit is contained in:
Georg Baum 2016-07-03 18:51:22 +02:00
parent 325fbab463
commit c7bfa7d341
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
3rdparty/libiconv/CMakeLists.txt vendored
View File

@ -45,7 +45,7 @@ add_definitions(-Dset_relocation_prefix=libcharset_set_relocation_prefix -Dreloc
set(SRC_LIBCHARSET ${SRCDIR}/libcharset/lib/localcharset.c) set(SRC_LIBCHARSET ${SRCDIR}/libcharset/lib/localcharset.c)
# libiconv # 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}) add_library(iconv ${SRC_LIBICONV} ${SRC_LIBCHARSET})
set_target_properties(iconv PROPERTIES COMPILE_FLAGS -DBUILDING_LIBICONV) set_target_properties(iconv PROPERTIES COMPILE_FLAGS -DBUILDING_LIBICONV)