Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ports/ryml/CONTROL
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Source: ryml
Version: 2020-04-12
Version: 2021-02-15
Homepage: https://github.com/biojppm/rapidyaml
Description: Rapid YAML library
Build-Depends: c4core[core]
Supports: !(arm|arm64|osx)
Supports: !(osx)
15 changes: 4 additions & 11 deletions ports/ryml/cmake-fix.patch
Original file line number Diff line number Diff line change
@@ -1,14 +1,8 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3e4eb23..115b8aa 100644
index 34b89f2..ec53588 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,5 @@
cmake_minimum_required(VERSION 3.9)
+
project(ryml)

include(./ext/c4core/cmake/c4Project.cmake)
@@ -19,8 +20,7 @@ option(RYML_BUILD_API "Enable API generation (python, etc)" OFF)
@@ -17,8 +17,7 @@ option(RYML_DBG "Enable (very verbose) ryml debug prints." OFF)

#-------------------------------------------------------

Expand All @@ -18,11 +12,11 @@ index 3e4eb23..115b8aa 100644

c4_add_library(ryml
SOURCES
@@ -46,10 +46,10 @@ c4_add_library(ryml
@@ -48,10 +47,10 @@ c4_add_library(ryml
ryml.natvis
SOURCE_ROOT ${RYML_SRC_DIR}
INC_DIRS
+ $<BUILD_INTERFACE:${C4CORE_INCLUDE_DIR}>
+ $<BUILD_INTERFACE:${C4CORE_INCLUDE_DIR}>
$<BUILD_INTERFACE:${RYML_SRC_DIR}>
$<INSTALL_INTERFACE:include>
- LIBS c4core
Expand All @@ -31,4 +25,3 @@ index 3e4eb23..115b8aa 100644
)

if(NOT RYML_DEFAULT_CALLBACKS)

10 changes: 4 additions & 6 deletions ports/ryml/portfile.cmake
Original file line number Diff line number Diff line change
@@ -1,27 +1,25 @@
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)

vcpkg_fail_port_install(
ON_ARCH "arm" "arm64"
ON_TARGET "OSX"
)

# Get rapidyaml src
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO biojppm/rapidyaml
REF ec23e87007ccc39c6132345c154b267de9381706
SHA512 7d349c0dd58da814dad02de88a5c54394ef8d77e7db3014fb5fb684d519e35604d45f5d16db5ed6ed8ccb52b1ed4a4dbc91e717a091b54b04dc18901800e12c1
REF db387345abf9cd6710e0c4a487a476bfd176fea3
SHA512 4dda145b561e3b8420f89ad01e42eb5056b51a8a28a47f3b8c91bb0a2a6420d1842016a23cbb17d9f119ebce0e2e404b4f4fb67d71bf0d3c87aa81f346c6cfe2
HEAD_REF master
PATCHES cmake-fix.patch
)

set(COMMIT_HASH a0f0c17bfc9a9a91cc72891539b513c129c6d122)

# Get cmake scripts for rapidyaml
set(COMMIT_HASH 71c211187b8c52a13d5c59a7979f2ccf8429e350)
vcpkg_download_distfile(CMAKE_ARCHIVE
URLS "https://github.com/biojppm/cmake/archive/${COMMIT_HASH}.zip"
FILENAME "cmake-${COMMIT_HASH}.zip"
SHA512 4fbc711f3120501fa40733c3b66e34cd6a7e1b598b1378fbb59d1a87c88290a03d021f5176634089da41682fd918d7e27c6c146052dec54d7e956be15f12744f
SHA512 d15884d985a477df47ead9c5c486cfdeb1df8b6de4f308c36bd7a8c0e901fb876980a2a4f239abd8ecb1fb0baf75ad559ca0780b50c84070762f8cbfe55cb9d2
)

vcpkg_extract_source_archive_ex(
Expand Down
1 change: 0 additions & 1 deletion scripts/ci.baseline.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1406,7 +1406,6 @@ rttr:x64-uwp=fail
rxspencer:x64-uwp=fail
rxspencer:arm-uwp=fail
ryml:arm-uwp=fail
ryml:arm64-windows=fail
ryml:x64-osx=fail
ryu:arm-uwp=fail
ryu:x64-uwp=fail
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -5573,7 +5573,7 @@
"port-version": 0
},
"ryml": {
"baseline": "2020-04-12",
"baseline": "2021-02-15",
"port-version": 0
},
"ryu": {
Expand Down
5 changes: 5 additions & 0 deletions versions/r-/ryml.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "e1289d79114def32da624bad2bd4a0d9025566af",
"version-string": "2021-02-15",
"port-version": 0
},
{
"git-tree": "ff07e4add8c6becd2fc4d57c2707cc141af1e341",
"version-string": "2020-04-12",
Expand Down