From 7906cd5da2b74b957c88f1c35dcda72bccaed694 Mon Sep 17 00:00:00 2001 From: Douglas Barker Date: Mon, 31 Aug 2026 16:38:23 -0400 Subject: [PATCH] [CMAKE] upgrade ryml to 0.16.0 --- ci/install_thirdparty.sh | 2 +- install/cmake/CMakeLists.txt | 6 ++++-- install/cmake/third_party_latest | 2 +- third_party_release | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ci/install_thirdparty.sh b/ci/install_thirdparty.sh index 9b95c2e9f8..3c1b078329 100755 --- a/ci/install_thirdparty.sh +++ b/ci/install_thirdparty.sh @@ -89,7 +89,7 @@ else CMAKE_BUILD_TYPE=Release fi -THIRDPARTY_BUILD_DIR="/tmp/otel-cpp-third-party-build" +THIRDPARTY_BUILD_DIR="/tmp/otel-third-party-build" CMAKE_OPTIONS=( "-DCMAKE_INSTALL_PREFIX=${THIRDPARTY_INSTALL_DIR}" "-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}" diff --git a/install/cmake/CMakeLists.txt b/install/cmake/CMakeLists.txt index 427f28f998..c8cc6335f4 100644 --- a/install/cmake/CMakeLists.txt +++ b/install/cmake/CMakeLists.txt @@ -23,7 +23,7 @@ # Defaults to 14 if not set. cmake_minimum_required(VERSION 3.16) -project(opentelemetry-cpp-thirdparty-install LANGUAGES CXX) +project(opentelemetry-thirdparty-install LANGUAGES CXX) # Added in CMake 3.16. ExternalProject_Add() with GIT_SUBMODULES "" initializes # no submodules. @@ -488,5 +488,7 @@ if(ryml IN_LIST _THIRDPARTY_PACKAGE_LIST) GIT_SHALLOW ON PREFIX ${CMAKE_BINARY_DIR}/external/ryml INSTALL_DIR ${CMAKE_INSTALL_PREFIX} - CMAKE_ARGS "${CMAKE_OPTIONS}") + CMAKE_ARGS "${CMAKE_OPTIONS}" "-DRYML_BUILD_TOOLS=OFF" + "-DRYML_BUILD_API=OFF" "-DRYML_DBG=OFF" + "-DRYML_DEFAULT_CALLBACK_USES_EXCEPTIONS=ON" "-DRYML_INSTALL=ON") endif() diff --git a/install/cmake/third_party_latest b/install/cmake/third_party_latest index e3d30c74b6..759e1654c0 100644 --- a/install/cmake/third_party_latest +++ b/install/cmake/third_party_latest @@ -16,4 +16,4 @@ nlohmann-json=v3.12.0 opentelemetry-proto=v1.10.0 opentracing-cpp=v1.6.0 prometheus-cpp=v1.3.0 -ryml=v0.15.2 +ryml=v0.16.0 diff --git a/third_party_release b/third_party_release index 05879a4c36..a91537e628 100644 --- a/third_party_release +++ b/third_party_release @@ -26,4 +26,4 @@ opentelemetry-configuration=v1.1.0 opentelemetry-proto=v1.10.0 opentracing-cpp=v1.6.0 prometheus-cpp=v1.3.0 -ryml=v0.15.2 +ryml=v0.16.0