From 7a7d11116dad5ce80307a14f8cc566d7154ef805 Mon Sep 17 00:00:00 2001 From: Kevin Lalumiere Date: Tue, 2 May 2023 15:13:00 -0400 Subject: [PATCH] Fix microsoft/vcpkg#31218 --- ports/opentelemetry-cpp/add-missing-find-dependency.patch | 5 +++-- ports/opentelemetry-cpp/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/o-/opentelemetry-cpp.json | 5 +++++ 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ports/opentelemetry-cpp/add-missing-find-dependency.patch b/ports/opentelemetry-cpp/add-missing-find-dependency.patch index d406703837a552..fc125e580079f3 100644 --- a/ports/opentelemetry-cpp/add-missing-find-dependency.patch +++ b/ports/opentelemetry-cpp/add-missing-find-dependency.patch @@ -1,11 +1,12 @@ diff --git a/cmake/opentelemetry-cpp-config.cmake.in b/cmake/opentelemetry-cpp-config.cmake.in -index adae58d..21baab7 100644 +index adae58dd..26427722 100644 --- a/cmake/opentelemetry-cpp-config.cmake.in +++ b/cmake/opentelemetry-cpp-config.cmake.in -@@ -69,6 +69,7 @@ set(OPENTELEMETRY_VERSION +@@ -69,6 +69,8 @@ set(OPENTELEMETRY_VERSION # ############################################################################## find_package(Threads) ++include(CMakeFindDependencyMacro) +find_dependency(absl) set_and_check(OPENTELEMETRY_CPP_INCLUDE_DIRS "@PACKAGE_INCLUDE_INSTALL_DIR@") diff --git a/ports/opentelemetry-cpp/vcpkg.json b/ports/opentelemetry-cpp/vcpkg.json index 47063820569cef..aa00547dcf9cf8 100644 --- a/ports/opentelemetry-cpp/vcpkg.json +++ b/ports/opentelemetry-cpp/vcpkg.json @@ -2,7 +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": 5, + "port-version": 6, "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 205a9f19d5ce0a..5872c44672af2e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5926,7 +5926,7 @@ }, "opentelemetry-cpp": { "baseline": "1.8.3", - "port-version": 5 + "port-version": 6 }, "opentracing": { "baseline": "1.6.0", diff --git a/versions/o-/opentelemetry-cpp.json b/versions/o-/opentelemetry-cpp.json index 95420ead2f5870..347650bed4a91f 100644 --- a/versions/o-/opentelemetry-cpp.json +++ b/versions/o-/opentelemetry-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dfd999f93f24e916631d57bf73c0bf02f8c2da0a", + "version-semver": "1.8.3", + "port-version": 6 + }, { "git-tree": "d01c3006eaa3db92a643c8b6e275e5275561d443", "version-semver": "1.8.3",