anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 13:18:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bundled iconv uses const

Browse Source
This commit is contained in:
Peter Kümmel 2015-12-09 21:38:45 +01:00
parent 7d2c054611
commit 6cc83c5072
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -680,6 +680,7 @@ endif()
if(LYX_3RDPARTY_BUILD)
add_subdirectory(src/3rdparty/libiconv)
set(HAVE_ICONV_CONST 1)
add_subdirectory(src/3rdparty/zlib)
endif()

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

@ -38,7 +38,7 @@ if(MINGW)
add_definitions(-DELOOP=0 -DHAVE_DECL_STRERROR_R=0)
endif ()
include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${BINDIR}/include ${SRCDIR}/include ${SRCDIR}/srclib)
include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR} ${BINDIR}/include ${SRCDIR}/include ${SRCDIR}/srclib)
add_definitions(-Dset_relocation_prefix=libcharset_set_relocation_prefix -Drelocate=libcharset_relocate -DHAVE_CONFIG_H -DINSTALLPREFIX=NULL -DNO_XMALLOC -DBUILDING_LIBCHARSET -DINSTALLDIR="" -DLIBDIR="" -DENABLE_RELOCATABLE=1 -DIN_LIBRARY)
# libcharset