diff options
| author | codicodi <rob.ceglinski@gmail.com> | 2017-01-14 02:55:32 +0100 |
|---|---|---|
| committer | codicodi <rob.ceglinski@gmail.com> | 2017-01-14 02:55:32 +0100 |
| commit | 5e1c18cd56db66c0a1f4f2816bc7938d47c1376d (patch) | |
| tree | df3e2b8f32c98f03199d6669bed23dab833fe2db | |
| parent | 6a3b19b9e04d304ef9e07a9d99d3abbd17552993 (diff) | |
| download | vcpkg-5e1c18cd56db66c0a1f4f2816bc7938d47c1376d.tar.gz vcpkg-5e1c18cd56db66c0a1f4f2816bc7938d47c1376d.zip | |
Revert "[glib] hunt down every mention of libiconv"
This reverts commit 6a3b19b9e04d304ef9e07a9d99d3abbd17552993.
| -rw-r--r-- | ports/glib/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | ports/glib/CONTROL | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/ports/glib/CMakeLists.txt b/ports/glib/CMakeLists.txt index d0358a990..1cf65d0a7 100644 --- a/ports/glib/CMakeLists.txt +++ b/ports/glib/CMakeLists.txt @@ -25,6 +25,9 @@ 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) @@ -62,8 +65,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} ${LIBINTL_LIBRARY}) -target_include_directories(glib PRIVATE ${PCRE_INCLUDE_DIR}) +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_include_directories(glib PUBLIC ${LIBINTL_INCLUDE_DIR}) list(APPEND GLIB_TARGETS glib) @@ -153,5 +156,6 @@ 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 219abc624..984d7576a 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 +Build-Depends: zlib, pcre, libffi, gettext, libiconv |