[msdfgen] Update to 1.10 (#29071)

* [msdfgen] update to 1.10

* [msdfgen] Fix x64-windows-static-md
This commit is contained in:
Viktor Chlumský 2023-01-21 07:15:55 +01:00 committed by GitHub
parent e4edf0f036
commit cdf1f4db96
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 64 additions and 10 deletions

View File

@ -1,5 +1,3 @@
# No symbols are exported in msdfgen source
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
if ("tools" IN_LIST FEATURES AND VCPKG_TARGET_IS_UWP) if ("tools" IN_LIST FEATURES AND VCPKG_TARGET_IS_UWP)
message(FATAL_ERROR "Tools cannot be built on UWP.") message(FATAL_ERROR "Tools cannot be built on UWP.")
@ -8,22 +6,37 @@ endif()
vcpkg_from_github( vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH OUT_SOURCE_PATH SOURCE_PATH
REPO Chlumsky/msdfgen REPO Chlumsky/msdfgen
REF v1.9.2 REF a811ef8935354d3f6d767cff6c4eebeb683777f2 # accessed on 2023-01-20
SHA512 5080a640c353fde86883946a04581a072b39d0d2111b5f3217344510d78324cea69df4e5046a380e84cf7da247d96efd4407c041991fae69e128ba435774e30f SHA512 6c7fb9e9a4f4dee2502e1dca2c4612aae005697476e30664cc263f09e336b1cd0b529d75af667cdd9063ac1dd183867ce9f5bb88731e3071687c87937dab29d9
HEAD_REF master HEAD_REF master
) )
vcpkg_check_features( vcpkg_check_features(
OUT_FEATURE_OPTIONS FEATURE_OPTIONS OUT_FEATURE_OPTIONS FEATURE_OPTIONS
FEATURES FEATURES
tools MSDFGEN_BUILD_STANDALONE
openmp MSDFGEN_USE_OPENMP openmp MSDFGEN_USE_OPENMP
geometry-preprocessing MSDFGEN_USE_SKIA
tools MSDFGEN_BUILD_STANDALONE
INVERTED_FEATURES
extensions MSDFGEN_CORE_ONLY
) )
if (VCPKG_CRT_LINKAGE STREQUAL dynamic)
set(MSDFGEN_DYNAMIC_RUNTIME ON)
else()
set(MSDFGEN_DYNAMIC_RUNTIME OFF)
endif()
vcpkg_cmake_configure( vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}" SOURCE_PATH "${SOURCE_PATH}"
OPTIONS OPTIONS
-DMSDFGEN_USE_VCPKG=ON
-DMSDFGEN_VCPKG_FEATURES_SET=ON
-DMSDFGEN_INSTALL=ON
-DMSDFGEN_DYNAMIC_RUNTIME="${MSDFGEN_DYNAMIC_RUNTIME}"
${FEATURE_OPTIONS} ${FEATURE_OPTIONS}
MAYBE_UNUSED_VARIABLES
MSDFGEN_VCPKG_FEATURES_SET
) )
vcpkg_cmake_install() vcpkg_cmake_install()
@ -31,7 +44,7 @@ vcpkg_cmake_install()
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/msdfgen) vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/msdfgen)
# move exe to tools # move exe to tools
if("tools" IN_LIST FEATURES AND VCPKG_LIBRARY_LINKAGE STREQUAL "static") if("tools" IN_LIST FEATURES)
vcpkg_copy_tools(TOOL_NAMES msdfgen AUTO_CLEAN) vcpkg_copy_tools(TOOL_NAMES msdfgen AUTO_CLEAN)
endif() endif()

View File

@ -1,11 +1,10 @@
{ {
"name": "msdfgen", "name": "msdfgen",
"version": "1.9.2", "version": "1.10.0",
"description": "Multi-channel signed distance field generator", "description": "Multi-channel signed distance field generator",
"homepage": "https://github.com/Chlumsky/msdfgen", "homepage": "https://github.com/Chlumsky/msdfgen",
"license": "MIT", "license": "MIT",
"dependencies": [ "dependencies": [
"freetype",
{ {
"name": "vcpkg-cmake", "name": "vcpkg-cmake",
"host": true "host": true
@ -15,12 +14,49 @@
"host": true "host": true
} }
], ],
"default-features": [
"extensions",
"geometry-preprocessing"
],
"features": { "features": {
"extensions": {
"description": "Extended functionality that depends on external libraries - loading fonts and SVG files, generating PNG images.",
"dependencies": [
"freetype",
"libpng",
"tinyxml2"
]
},
"geometry-preprocessing": {
"description": "Preprocessing of non-compliant vector geometry via the Skia library.",
"dependencies": [
{
"name": "msdfgen",
"default-features": false,
"features": [
"extensions"
]
},
{
"name": "skia",
"default-features": false
}
]
},
"openmp": { "openmp": {
"description": "Build with OpenMP support for multi-threaded code." "description": "Build with OpenMP support for multi-threaded code."
}, },
"tools": { "tools": {
"description": "Generates an executable inside the tools folder. Not supported on UWP." "description": "Generates an executable inside the tools folder. Not supported on UWP.",
"dependencies": [
{
"name": "msdfgen",
"default-features": false,
"features": [
"extensions"
]
}
]
} }
} }
} }

View File

@ -5125,7 +5125,7 @@
"port-version": 0 "port-version": 0
}, },
"msdfgen": { "msdfgen": {
"baseline": "1.9.2", "baseline": "1.10.0",
"port-version": 0 "port-version": 0
}, },
"msgpack": { "msgpack": {

View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "f03e46126dcb57f2ff08f5834eb6e84f84e14e2b",
"version": "1.10.0",
"port-version": 0
},
{ {
"git-tree": "d49eb065f4ec389be55189e28ab310178281bfe7", "git-tree": "d49eb065f4ec389be55189e28ab310178281bfe7",
"version": "1.9.2", "version": "1.9.2",