From 2b78cac373da1bde47d4c99d3c7c5f96398181a4 Mon Sep 17 00:00:00 2001 From: Lily <47812810+LilyWangL@users.noreply.github.com> Date: Sat, 31 Aug 2019 02:53:11 +0800 Subject: [PATCH] [glib] Fix install config.h (#7963) * [glib] Fix install config.h --- ports/glib/CMakeLists.txt | 1 + ports/glib/CONTROL | 2 +- ports/glib/portfile.cmake | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) 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)