diff options
| author | zi-m <zi.m.github.com@gmail.com> | 2019-09-07 23:08:23 +0200 |
|---|---|---|
| committer | zi-m <zi.m.github.com@gmail.com> | 2019-09-07 23:08:23 +0200 |
| commit | 108faffff4c995bc36c08695f72c14ae0f21163c (patch) | |
| tree | 88a01a6076f142e4ad1b6002f4c7dc3730aa50ca /ports/glib | |
| parent | 7fd21c5d827c2d77b21270646c2fe53704245747 (diff) | |
| parent | 4cffadc18891aa6cc5a512cf500ad468c54cd3d0 (diff) | |
| download | vcpkg-108faffff4c995bc36c08695f72c14ae0f21163c.tar.gz vcpkg-108faffff4c995bc36c08695f72c14ae0f21163c.zip | |
Merge remote-tracking branch 'upstream/master' into wxchartdir
Diffstat (limited to 'ports/glib')
| -rw-r--r-- | ports/glib/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | ports/glib/CONTROL | 2 | ||||
| -rw-r--r-- | ports/glib/portfile.cmake | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/ports/glib/CMakeLists.txt b/ports/glib/CMakeLists.txt index ccc2a77e2..275dcd0af 100644 --- a/ports/glib/CMakeLists.txt +++ b/ports/glib/CMakeLists.txt @@ -102,6 +102,7 @@ else() endif() add_definitions("-DGIO_MODULE_DIR=\"gio/modules\"") endif() +install(FILES ${CMAKE_BINARY_DIR}/config/config.h DESTINATION include/glib) include_directories(${CMAKE_BINARY_DIR}/config ${CMAKE_BINARY_DIR}/config/glib ${CMAKE_BINARY_DIR}/config/gio ${CMAKE_BINARY_DIR}/config/gmodule) include_directories(. glib) diff --git a/ports/glib/CONTROL b/ports/glib/CONTROL index e589ba426..1bb22c6df 100644 --- a/ports/glib/CONTROL +++ b/ports/glib/CONTROL @@ -1,5 +1,5 @@ Source: glib -Version: 2.52.3-14-2 +Version: 2.52.3-14-3 Homepage: https://developer.gnome.org/glib/ Description: Portable, general-purpose utility library. Build-Depends: zlib, pcre, libffi, gettext, libiconv diff --git a/ports/glib/portfile.cmake b/ports/glib/portfile.cmake index 44a499320..2dc9aee13 100644 --- a/ports/glib/portfile.cmake +++ b/ports/glib/portfile.cmake @@ -48,5 +48,7 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-glib TARGET_PATH share/un vcpkg_copy_pdbs() vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/glib) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/glib) file(RENAME ${CURRENT_PACKAGES_DIR}/share/glib/COPYING ${CURRENT_PACKAGES_DIR}/share/glib/copyright) |