Skip to content

chore(deps): update dependency vcpkg to v2025.06.13 #109

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
sjinks merged 4 commits into from
Jun 23, 2025
Merged

chore(deps): update dependency vcpkg to v2025.06.13 #109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2e62973
chore(deps): update dependency vcpkg to v2025.06.13
renovate[bot] Jun 17, 2025
4e4424c
chore(deps): update default registry's baseline to `ef7dbf94b9198bc58…
renovate[bot] Jun 17, 2025
95438e6
fix: update cmake config
sjinks Jun 23, 2025
43d61a8
Merge pull request #110 from sjinks/update-vcpkg-baseline-ef7dbf94b91…
sjinks Jun 23, 2025
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 .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[submodule "vcpkg"]
path = vcpkg
url = https://github.com/microsoft/vcpkg.git
branch = 2025.04.09
branch = 2025.06.13
2 changes: 1 addition & 1 deletion cmake/wwa_opentelemetry_resource_detectors-config.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ get_filename_component(OTEL_RESOURCE_DETECTORS_CMAKE_DIR "${CMAKE_CURRENT_LIST_F
list(APPEND CMAKE_MODULE_PATH ${OTEL_RESOURCE_DETECTORS_CMAKE_DIR})

include(CMakeFindDependencyMacro)
find_dependency(opentelemetry-cpp QUIET REQUIRED COMPONENTS resources)
find_dependency(opentelemetry-cpp QUIET REQUIRED COMPONENTS sdk)

if(NOT TARGET wwa_opentelemetry_resource_detectors)
include("${OTEL_RESOURCE_DETECTORS_CMAKE_DIR}/wwa_opentelemetry_resource_detectors-target.cmake")
Expand Down
2 changes: 1 addition & 1 deletion vcpkg
Open in desktop
Submodule vcpkg updated 2046 files
2 changes: 1 addition & 1 deletion vcpkg-configuration.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"default-registry": {
"kind": "git",
"baseline": "ce613c41372b23b1f51333815feb3edd87ef8a8b",
"baseline": "ef7dbf94b9198bc58f45951adcf1f041fcbc5ea0",
"repository": "https://github.com/microsoft/vcpkg"
},
"registries": [
Expand Down