mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-06-11 17:12:52 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[ryml] Support osx (#20661)

Browse Source 
* [ryml] Support osx

* Update deprecated functions

* Remove supports field
This commit is contained in:
NancyLi1013 2021-10-13 08:09:17 +08:00 committed by GitHub
parent b8c39998ea
commit f978be6534
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ports/ryml/portfile.cmake
View File

@ -1,9 +1,5 @@
vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_fail_port_install(
ON_TARGET "OSX"
)
# Get rapidyaml src # Get rapidyaml src
vcpkg_from_github( vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH OUT_SOURCE_PATH SOURCE_PATH
@ -38,21 +34,20 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
dbg RYML_DBG dbg RYML_DBG
) )
vcpkg_configure_cmake( vcpkg_cmake_configure(
SOURCE_PATH ${SOURCE_PATH} SOURCE_PATH "${SOURCE_PATH}"
PREFER_NINJA
OPTIONS OPTIONS
${FEATURE_OPTIONS} ${FEATURE_OPTIONS}
) )
vcpkg_install_cmake() vcpkg_cmake_install()
vcpkg_copy_pdbs() vcpkg_copy_pdbs()
if(EXISTS ${CURRENT_PACKAGES_DIR}/cmake) if(EXISTS "${CURRENT_PACKAGES_DIR}/cmake")
vcpkg_fixup_cmake_targets(CONFIG_PATH cmake) vcpkg_cmake_config_fixup(CONFIG_PATH cmake)
elseif(EXISTS ${CURRENT_PACKAGES_DIR}/lib/cmake/ryml) elseif(EXISTS "${CURRENT_PACKAGES_DIR}/lib/cmake/ryml")
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/ryml) vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/ryml)
endif() endif()
# Move headers and natvis to own dir # Move headers and natvis to own dir
@ -72,6 +67,4 @@ file(WRITE "${CURRENT_PACKAGES_DIR}/share/ryml/rymlConfig.cmake" "${_contents}")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
file(INSTALL file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
"${SOURCE_PATH}/LICENSE.txt"
DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

10
ports/ryml/vcpkg.json
View File

@ -1,13 +1,21 @@
{ {
"name": "ryml", "name": "ryml",
"version-date": "2021-07-24", "version-date": "2021-07-24",
"port-version": 1,
"description": "Rapid YAML library", "description": "Rapid YAML library",
"homepage": "https://github.com/biojppm/rapidyaml", "homepage": "https://github.com/biojppm/rapidyaml",
"supports": "!osx",
"dependencies": [ "dependencies": [
{ {
"name": "c4core", "name": "c4core",
"default-features": false "default-features": false
},
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
} }
], ],
"default-features": [ "default-features": [

1
scripts/ci.baseline.txt
View File

@ -1359,7 +1359,6 @@ rtlsdr:x64-linux=fail
rtlsdr:x64-osx=fail rtlsdr:x64-osx=fail
rttr:arm-uwp=fail rttr:arm-uwp=fail
rttr:x64-uwp=fail rttr:x64-uwp=fail
ryml:x64-osx=fail
ryu:arm-uwp=fail ryu:arm-uwp=fail
ryu:x64-uwp=fail ryu:x64-uwp=fail
ryu:x64-windows-static=fail ryu:x64-windows-static=fail

2
versions/baseline.json
View File

@ -5970,7 +5970,7 @@
}, },
"ryml": { "ryml": {
"baseline": "2021-07-24", "baseline": "2021-07-24",
"port-version": 0 "port-version": 1
}, },
"ryu": { "ryu": {
"baseline": "2.0", "baseline": "2.0",

5
versions/r-/ryml.json
View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "599ab36a18b1a0c439fdc6dc740bf0575a06641e",
"version-date": "2021-07-24",
"port-version": 1
},
{ {
"git-tree": "d97344132c58ae2aafb8c0ed1f23acde843404b5", "git-tree": "d97344132c58ae2aafb8c0ed1f23acde843404b5",
"version-date": "2021-07-24", "version-date": "2021-07-24",