[LyX/master] bundled iconv uses const

[Peter Kümmel]

commit 6cc83c5072b999ae3c41c79a8e4e3d168ff82024
Author: Peter Kümmel <kuem...@lyx.org>
Date:   Wed Dec 9 21:38:45 2015 +0100

    bundled iconv uses const

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e65b259..848160a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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()
 
diff --git a/src/3rdparty/libiconv/CMakeLists.txt 
b/src/3rdparty/libiconv/CMakeLists.txt
index 65046e7..e1c6e2c 100644
--- a/src/3rdparty/libiconv/CMakeLists.txt
+++ b/src/3rdparty/libiconv/CMakeLists.txt
@@ -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