Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[opentelemetry-cpp] Don't prefer CMake config #41742

Merged
merged 1 commit into from
Oct 25, 2024
Merged

[opentelemetry-cpp] Don't prefer CMake config #41742

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 20 additions & 0 deletions ports/opentelemetry-cpp/cmake-quirks.diff
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index fd41fa7..cde4566 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,7 +24,6 @@ project(opentelemetry-cpp)
mark_as_advanced(CMAKE_TOOLCHAIN_FILE)

# Prefer cmake CONFIG to auto resolve dependencies.
-set(CMAKE_FIND_PACKAGE_PREFER_CONFIG TRUE)

# Don't use customized cmake modules if vcpkg is used to resolve dependence.
if(NOT DEFINED CMAKE_TOOLCHAIN_FILE)
@@ -96,7 +95,6 @@ if(DEFINED ENV{VCPKG_ROOT} AND NOT DEFINED CMAKE_TOOLCHAIN_FILE)
endif()

if(VCPKG_CHAINLOAD_TOOLCHAIN_FILE)
- include("${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}")
endif()

option(WITH_ABI_VERSION_1 "ABI version 1" ON)
1 change: 1 addition & 0 deletions ports/opentelemetry-cpp/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ vcpkg_from_github(
SHA512 c89c4f7a73c11c020f8ea1cb836ccd222456f899ede8e81a1fd0024e0a88f17c44a66bada8ed3010b0d03ac052475edb34b855aeafcff50975d24c8859463d68
HEAD_REF main
PATCHES
cmake-quirks.diff
# Missing find_dependency for Abseil
add-missing-find-dependency.patch
)
Expand Down
1 change: 1 addition & 0 deletions ports/opentelemetry-cpp/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
"name": "opentelemetry-cpp",
"version-semver": "1.17.0",
"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."
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6722,7 +6722,7 @@
},
"opentelemetry-cpp": {
"baseline": "1.17.0",
"port-version": 0
"port-version": 1
},
"opentelemetry-cpp-contrib-version": {
"baseline": "2024-06-17",
Expand Down
5 changes: 5 additions & 0 deletions versions/o-/opentelemetry-cpp.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "676c68ab244c1b790041e5ae63dd72f794deb5d9",
"version-semver": "1.17.0",
"port-version": 1
},
{
"git-tree": "f1c52bb415c2c2e19b33e37dc85a2747720ae033",
"version-semver": "1.17.0",
Expand Down