Skip to content
Merged
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
2 changes: 1 addition & 1 deletion ci/install_thirdparty.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down
6 changes: 4 additions & 2 deletions install/cmake/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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()
2 changes: 1 addition & 1 deletion install/cmake/third_party_latest
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion third_party_release
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading