+10 -2

src/libiconv/CMakeLists.txt

reviewed

··· 2 2 3 3 cmake_minimum_required(VERSION 2.4.0) 4 4 5 5 + if(COMMAND cmake_policy) 6 6 + cmake_policy(SET CMP0003 NEW) 7 7 + endif(COMMAND cmake_policy) 8 8 + 9 9 + 5 10 if(CMAKE_SIZEOF_VOID_P EQUAL 4 OR CMAKE_INSTALL_LIBDIR STREQUAL "lib32") 6 11 set(BITS 32) 7 12 add_definitions(-DTARGET_CPU_X86=1) ··· 22 27 SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) 23 28 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) 24 29 30 30 + add_definitions(-DHAVE_CONFIG_H) 25 31 configure_file(include.h.in include.h) 26 32 33 33 + include_directories(${CMAKE_CURRENT_SOURCE_DIR}) 34 34 + include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src) 27 35 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include) 28 36 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/libcharset/include) 29 37 ··· 50 58 #lib/genflags.c 51 59 #lib/gentranslit.c 52 60 lib/iconv.c 53 53 - lib/relocatable.c 61 61 + #lib/relocatable.c 54 62 55 63 libcharset/src/localcharset.c 56 56 - libcharset/src/relocatable.c 64 64 + #libcharset/src/relocatable.c 57 65 ) 58 66 59 67 add_library(iconv SHARED ${iconv_SRCS}

+3

src/libiconv/config.h

reviewed

··· 1 1 + #define ENABLE_EXTRA 1 2 2 + #define ENABLE_RELOCATABLE 1 3 3 + #define HAVE_UNISTD_H 1

+2

src/libiconv/include.h.in

reviewed

··· 1 1 #define DLL_VARIABLE 2 2 #define EXEEXT "" 3 3 + #define relocate libiconv_relocate 4 4 + #define set_relocation_prefix libiconv_set_relocation_prefix 3 5 #define LIBDIR "${CMAKE_INSTALL_PREFIX}/lib${SUFFIX}/darling" 4 6