diff options
| author | codicodi <rob.ceglinski@gmail.com> | 2017-01-14 02:20:44 +0100 |
|---|---|---|
| committer | codicodi <rob.ceglinski@gmail.com> | 2017-01-14 02:20:44 +0100 |
| commit | 6a3b19b9e04d304ef9e07a9d99d3abbd17552993 (patch) | |
| tree | 6a9b77b84d40c68db6b7506d0d7360bdf30de0d5 | |
| parent | ccd3e399f023129a39bb9a402324676a9391a970 (diff) | |
| download | vcpkg-6a3b19b9e04d304ef9e07a9d99d3abbd17552993.tar.gz vcpkg-6a3b19b9e04d304ef9e07a9d99d3abbd17552993.zip | |
[glib] hunt down every mention of libiconv
| -rw-r--r-- | ports/glib/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | ports/glib/CONTROL | 2 |
2 files changed, 3 insertions, 7 deletions
diff --git a/ports/glib/CMakeLists.txt b/ports/glib/CMakeLists.txt index 1cf65d0a7..d0358a990 100644 --- a/ports/glib/CMakeLists.txt +++ b/ports/glib/CMakeLists.txt @@ -25,9 +25,6 @@ if(CMAKE_BUILD_TYPE STREQUAL Debug) set(PCRE_SUFFIX d) endif() find_library(PCRE_LIBRARY pcre${PCRE_SUFFIX}) -# libiconv -find_path(ICONV_INCLUDE_DIR iconv.h) -find_library(ICONV_LIBRARY NAMES iconv libiconv) # libffi find_path(FFI_INCLUDE_DIR ffi.h) find_library(FFI_LIBRARY NAMES ffi libffi) @@ -65,8 +62,8 @@ extract_vcproj_sources(build/win32/vs14/glib.vcxproj GLIB_SOURCES) list(APPEND GLIB_SOURCES glib/libcharset/localcharset.c) # modified internal version with prefixed symbols add_library(glib ${GLIB_SOURCES}) target_compile_definitions(glib PRIVATE USE_SYSTEM_PCRE ${GLIB_EXPORT_MACRO} GLIB_COMPILATION G_LOG_DOMAIN="GLib" LIBDIR) -target_link_libraries(glib ws2_32 winmm ${PCRE_LIBRARY} ${ICONV_LIBRARY} ${LIBINTL_LIBRARY}) -target_include_directories(glib PRIVATE ${PCRE_INCLUDE_DIR} ${ICONV_INCLUDE_DIR}) +target_link_libraries(glib ws2_32 winmm ${PCRE_LIBRARY} ${LIBINTL_LIBRARY}) +target_include_directories(glib PRIVATE ${PCRE_INCLUDE_DIR}) target_include_directories(glib PUBLIC ${LIBINTL_INCLUDE_DIR}) list(APPEND GLIB_TARGETS glib) @@ -156,6 +153,5 @@ endif() message(STATUS "Link-time dependencies:") message(STATUS " " ${ZLIB_LIBRARIES}) message(STATUS " " ${PCRE_LIBRARY}) -message(STATUS " " ${ICONV_LIBRARY}) message(STATUS " " ${FFI_LIBRARY}) message(STATUS " " ${LIBINTL_LIBRARY}) diff --git a/ports/glib/CONTROL b/ports/glib/CONTROL index 984d7576a..219abc624 100644 --- a/ports/glib/CONTROL +++ b/ports/glib/CONTROL @@ -1,4 +1,4 @@ Source: glib Version: 2.50.2 Description: Portable, general-purpose utility library. -Build-Depends: zlib, pcre, libffi, gettext, libiconv +Build-Depends: zlib, pcre, libffi, gettext |