From 6d49a9591eea3bb4dd23e63b650a04c4d7a9b327 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Tue, 28 Mar 2023 22:35:06 +0200 Subject: [PATCH] [opentelemetry-cpp] fix otlp feature on mac (#30466) --- ports/opentelemetry-cpp/portfile.cmake | 1 + ports/opentelemetry-cpp/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/o-/opentelemetry-cpp.json | 5 +++++ 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ports/opentelemetry-cpp/portfile.cmake b/ports/opentelemetry-cpp/portfile.cmake index 839b5a8bb5..fbce990dd0 100644 --- a/ports/opentelemetry-cpp/portfile.cmake +++ b/ports/opentelemetry-cpp/portfile.cmake @@ -38,6 +38,7 @@ if(WITH_OTLP) file(COPY "${src}/." DESTINATION "${SOURCE_PATH}/third_party/opentelemetry-proto") # Create empty .git directory to prevent opentelemetry from cloning it during build time file(MAKE_DIRECTORY "${SOURCE_PATH}/third_party/opentelemetry-proto/.git") + list(APPEND FEATURE_OPTIONS -DCMAKE_CXX_STANDARD=14) endif() vcpkg_cmake_configure( diff --git a/ports/opentelemetry-cpp/vcpkg.json b/ports/opentelemetry-cpp/vcpkg.json index 94f0f57259..798d03e186 100644 --- a/ports/opentelemetry-cpp/vcpkg.json +++ b/ports/opentelemetry-cpp/vcpkg.json @@ -2,6 +2,7 @@ "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json", "name": "opentelemetry-cpp", "version-semver": "1.8.3", + "port-version": 1, "description": [ "OpenTelemetry is a collection of tools, APIs, and SDKs.", "You use it to instrument, generate, collect, and export telemetry data (metrics, logs, and traces) for analysis in order to understand your software's performance and behavior." diff --git a/versions/baseline.json b/versions/baseline.json index 7f7073f4a9..6956adebc8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5858,7 +5858,7 @@ }, "opentelemetry-cpp": { "baseline": "1.8.3", - "port-version": 0 + "port-version": 1 }, "opentracing": { "baseline": "1.6.0", diff --git a/versions/o-/opentelemetry-cpp.json b/versions/o-/opentelemetry-cpp.json index d18ab3c7a8..14404a94c2 100644 --- a/versions/o-/opentelemetry-cpp.json +++ b/versions/o-/opentelemetry-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3777014ad8e4997a8c0afbbc7f37ff949497059c", + "version-semver": "1.8.3", + "port-version": 1 + }, { "git-tree": "7b038c874943ff65c4753c535698f6f409391dab", "version-semver": "1.8.3",