Skip to content

OpenTelemetry vcpkg fixes #3716

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

Merged
antkmsft merged 12 commits into from
Jun 7, 2022
Merged

OpenTelemetry vcpkg fixes #3716

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
09fea3c
OpenTelemetry vcpkg fixes
antkmsft Jun 7, 2022
2c982ea
Update ci.yml
antkmsft Jun 7, 2022
0e4bae7
Drop version >= from project-level vcpkg
antkmsft Jun 7, 2022
b9fd27a
find_package only supports numeric versions
antkmsft Jun 7, 2022
00f342f
include(AzureBuildTargetForCI)
antkmsft Jun 7, 2022
76f259b
Do not build as Windows/UWP DLL
antkmsft Jun 7, 2022
4407c53
Docs and package dependencies
antkmsft Jun 7, 2022
505097d
Update condition
antkmsft Jun 7, 2022
d03e164
Move condition down
antkmsft Jun 7, 2022
be442f6
Move more under condition
antkmsft Jun 7, 2022
6fdf16f
Rephrase condition
antkmsft Jun 7, 2022
b2667e5
Try hack for CI that won't affect vcpkg
antkmsft Jun 7, 2022
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
4 changes: 2 additions & 2 deletions sdk/core/azure-core-tracing-opentelemetry/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ include(CreateMapFile)
find_package(Threads REQUIRED)

if(NOT AZ_ALL_LIBRARIES)
find_package(azure-core-cpp "1.5.0" CONFIG QUIET)
find_package(azure-core-cpp "1.7.0-beta.1" CONFIG QUIET)
if(NOT azure-core-cpp_FOUND)
find_package(azure-core-cpp "1.5.0" REQUIRED)
find_package(azure-core-cpp "1.7.0-beta.1" REQUIRED)
endif()
endif()
find_package(opentelemetry-cpp "1.3.0" CONFIG REQUIRED)
Expand Down
9 changes: 7 additions & 2 deletions sdk/core/azure-core-tracing-opentelemetry/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
{
"name": "azure-core-tracing-opentelemetry-cpp",
"version-string": "1.0.0-beta.1",
"supports": "!(windows & !static)",
"dependencies": [
{
"name": "opentelemetry-cpp",
"platform": "!uwp"
"name": "azure-core-cpp",
"default-features": false,
"version>=": "1.7.0-beta.1"
},
{
"name": "opentelemetry-cpp"
},
{
"name": "vcpkg-cmake",
Expand Down
7 changes: 4 additions & 3 deletions sdk/core/azure-core-tracing-opentelemetry/vcpkg/Config.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,11 @@
@PACKAGE_INIT@

include(CMakeFindDependencyMacro)
find_dependency(azure-core-cpp "1.7.0-beta.1")
find_dependency(Threads)

find_dependency(opentelemetry-cpp@CURL_MIN_REQUIRED_VERSION@)
find_dependency(opentelemetry-cpp)

include("${CMAKE_CURRENT_LIST_DIR}/azure-core-opentelemetry-cppTargets.cmake")
include("${CMAKE_CURRENT_LIST_DIR}/azure-core-tracing-opentelemetry-cppTargets.cmake")

check_required_components("azure-core-opentelemetry-cpp")
check_required_components("azure-core-tracing-opentelemetry-cpp")
5 changes: 2 additions & 3 deletions sdk/core/azure-core-tracing-opentelemetry/vcpkg/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,13 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO Azure/azure-sdk-for-cpp
REF azure-core_coretracing@AZ_LIBRARY_VERSION@
REF azure-core-tracing-opentelemetry_@AZ_LIBRARY_VERSION@
SHA512 0
)

vcpkg_cmake_configure(
SOURCE_PATH ${SOURCE_PATH}/sdk/core/azure-core/
SOURCE_PATH ${SOURCE_PATH}/sdk/core/azure-core-tracing-opentelemetry/
OPTIONS
${FEATURE_OPTIONS}
-DWARNINGS_AS_ERRORS=OFF
)

Expand Down
19 changes: 13 additions & 6 deletions sdk/core/azure-core-tracing-opentelemetry/vcpkg/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,32 @@
# SPDX-License-Identifier: MIT

{
"name": "azure-core-opentelemetry-cpp",
"name": "azure-core-tracing-opentelemetry-cpp",
"version-semver": "@AZ_LIBRARY_VERSION@",
"description": [
"Microsoft Azure Core OpenTelemetry SDK for C++",
"Microsoft Azure Core Tracing OpenTelemetry SDK for C++",
"This library provides support for modern Azure SDK client libraries written in C++ to leverage OpenTelemetry APIs."
],
"homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/main/sdk/core/azure-core-opentelemetry",
"homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/main/sdk/core/azure-core-tracing-opentelemetry",
"license": "MIT",
"supports": "!(windows & !static)",
Comment thread
antkmsft marked this conversation as resolved.
"dependencies": [
{
"name": "azure-core-cpp",
"default-features": false,
"version>=": "1.7.0-beta.1"
},
{
"name": "opentelemetry-cpp",
"version>=": "1.3.0"
},
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
},
{
"name": "opentelemetry-cpp"
}
]
}