[glib] Install msvc_recommended_pragmas.h to <vcpkg>/installed/include (#9054)

This commit is contained in:
Lily 2020-01-07 07:07:30 +08:00 committed by dan-shaw
parent 59b1a8a791
commit ee0716be5b
3 changed files with 5 additions and 8 deletions

View File

@ -109,6 +109,7 @@ else()
add_definitions("-DGIO_MODULE_DIR=\"gio/modules\"")
endif()
install(FILES ${CMAKE_BINARY_DIR}/config/config.h DESTINATION include/glib)
install(FILES ${CMAKE_SOURCE_DIR}/msvc_recommended_pragmas.h DESTINATION include)
include_directories(${CMAKE_BINARY_DIR}/config ${CMAKE_BINARY_DIR}/config/glib ${CMAKE_BINARY_DIR}/config/gio ${CMAKE_BINARY_DIR}/config/gmodule)
include_directories(. glib)

View File

@ -1,5 +1,5 @@
Source: glib
Version: 2.52.3-14-4
Version: 2.52.3-14-5
Homepage: https://developer.gnome.org/glib/
Description: Portable, general-purpose utility library.
Build-Depends: zlib, pcre, libffi, gettext, libiconv

View File

@ -1,13 +1,9 @@
include(vcpkg_common_functions)
# Glib uses winapi functions not available in WindowsStore
if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL WindowsStore)
message(FATAL_ERROR "Error: UWP builds are currently not supported.")
endif()
vcpkg_fail_port_install(ON_TARGET "UWP")
# Glib relies on DllMain on Windows
if (NOT VCPKG_CMAKE_SYSTEM_NAME)
vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY ONLY_DYNAMIC_CRT)
if (VCPKG_TARGET_IS_WINDOWS)
vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
endif()
set(GLIB_VERSION 2.52.3)