mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-24 17:29:01 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[glib] update to 2.52.1

Browse Source
This commit is contained in:
codicodi 2017-04-09 11:15:32 +02:00
parent c33589ac27
commit 0af686a9f7
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ports/glib/CMakeLists.txt
View File

@ -60,7 +60,7 @@ macro(extract_vcproj_sources VC_PROJECT OUT_VAR)
endmacro()
# main module
extract_vcproj_sources(build/win32/vs14/glib.vcxproj GLIB_SOURCES)
extract_vcproj_sources(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)
@ -77,7 +77,7 @@ target_include_directories(gthread PRIVATE ${LIBINTL_INCLUDE_DIR})
list(APPEND GLIB_TARGETS gthread)
# gobject
extract_vcproj_sources(build/win32/vs14/gobject.vcxproj GOBJECT_SOURCES)
extract_vcproj_sources(win32/vs14/gobject.vcxproj GOBJECT_SOURCES)
add_library(gobject ${GOBJECT_SOURCES})
target_compile_definitions(gobject PRIVATE GOBJECT_COMPILATION ${GLIB_EXPORT_MACRO} G_LOG_DOMAIN="GLib-GObject")
target_link_libraries(gobject gthread glib ${FFI_LIBRARY})
@ -92,7 +92,7 @@ target_include_directories(gmodule PRIVATE ${LIBINTL_INCLUDE_DIR})
list(APPEND GLIB_TARGETS gmodule)
# gio
extract_vcproj_sources(build/win32/vs14/gio.vcxproj GIO_SOURCES)
extract_vcproj_sources(win32/vs14/gio.vcxproj GIO_SOURCES)
add_library(gio ${GIO_SOURCES})
target_compile_definitions(gio PRIVATE GIO_COMPILATION ${GLIB_EXPORT_MACRO} G_LOG_DOMAIN="GLib-GIO")
target_link_libraries(gio glib gmodule gobject ws2_32 shlwapi dnsapi iphlpapi ${ZLIB_LIBRARIES})

2
ports/glib/CONTROL
View File

@ -1,4 +1,4 @@
Source: glib
Version: 2.50.3
Version: 2.52.1
Description: Portable, general-purpose utility library.
Build-Depends: zlib, pcre, libffi, gettext, libiconv

1
ports/glib/cmake/install_headers.cmake
View File

@ -76,6 +76,7 @@ install(FILES glib/gtypes.h DESTINATION include/glib)
install(FILES glib/gunicode.h DESTINATION include/glib)
install(FILES glib/gurifuncs.h DESTINATION include/glib)
install(FILES glib/gutils.h DESTINATION include/glib)
install(FILES glib/guuid.h DESTINATION include/glib)
install(FILES glib/gvarianttype.h DESTINATION include/glib)
install(FILES glib/gvariant.h DESTINATION include/glib)
install(FILES glib/gversion.h DESTINATION include/glib)

6
ports/glib/portfile.cmake
View File

@ -10,12 +10,12 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
endif()
include(vcpkg_common_functions)
set(GLIB_VERSION 2.50.3)
set(GLIB_VERSION 2.52.1)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/glib-${GLIB_VERSION})
vcpkg_download_distfile(ARCHIVE
URLS "https://ftp.gnome.org/pub/gnome/sources/glib/2.50/glib-${GLIB_VERSION}.tar.xz"
URLS "https://ftp.gnome.org/pub/gnome/sources/glib/2.52/glib-${GLIB_VERSION}.tar.xz"
FILENAME "glib-${GLIB_VERSION}.tar.xz"
SHA512 ef35806c15170b6608445f255136c0bebd2d433adf903c2af2865f6a57b4f2fcfc1e4a7cea1a0dac48ff5fe26248fbf7886dba4a8d209506f0a94160df8fb7af)
SHA512 6f0475b4ee1078867671a79b1751674926ba1caa872cec3896e2830c61c3cde67972afa9f2d606a2b6705e9846222462b003c6e966a9b63982f3fc3fb58c4d37)
vcpkg_extract_source_archive(${ARCHIVE})
vcpkg_apply_patches(