diff options
| author | Lily <47812810+LilyWangL@users.noreply.github.com> | 2020-01-07 07:07:30 +0800 |
|---|---|---|
| committer | dan-shaw <51385773+dan-shaw@users.noreply.github.com> | 2020-01-06 15:07:30 -0800 |
| commit | ee0716be5bd630714e00b26afe488a819682b7e3 (patch) | |
| tree | 2005f64fea4010128c028a8a85cf5e3c23d50c28 | |
| parent | 59b1a8a7915db29c07772d64c66dd0f7bfe9d3e6 (diff) | |
| download | vcpkg-ee0716be5bd630714e00b26afe488a819682b7e3.tar.gz vcpkg-ee0716be5bd630714e00b26afe488a819682b7e3.zip | |
[glib] Install msvc_recommended_pragmas.h to <vcpkg>/installed/include (#9054)
| -rw-r--r-- | ports/glib/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | ports/glib/CONTROL | 2 | ||||
| -rw-r--r-- | ports/glib/portfile.cmake | 10 |
3 files changed, 5 insertions, 8 deletions
diff --git a/ports/glib/CMakeLists.txt b/ports/glib/CMakeLists.txt index 341b163c8..4da1a80a1 100644 --- a/ports/glib/CMakeLists.txt +++ b/ports/glib/CMakeLists.txt @@ -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) diff --git a/ports/glib/CONTROL b/ports/glib/CONTROL index c754e0785..cdf5441fe 100644 --- a/ports/glib/CONTROL +++ b/ports/glib/CONTROL @@ -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 diff --git a/ports/glib/portfile.cmake b/ports/glib/portfile.cmake index 41c3c5017..7823debc9 100644 --- a/ports/glib/portfile.cmake +++ b/ports/glib/portfile.cmake @@ -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) |