Skip to content

Update dependencies baseline #206

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

Update dependencies baseline #206

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
6673e63
update vcpkg baseline
duncanpo Sep 3, 2025
8477e96
add a Mac debug workflow
duncanpo Sep 4, 2025
ec9cf9c
fix typo in debug workflow
duncanpo Sep 4, 2025
c6df88a
remove debug workflow
duncanpo Sep 4, 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
6 changes: 2 additions & 4 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,7 +423,7 @@ if(WIN32)

if(WITH_OTLP_HTTP)
set(OPENTELEMETRY_PROXY_RUNTIME_LIBRARIES ${OPENTELEMETRY_PROXY_RUNTIME_LIBRARIES}
$<TARGET_FILE:CURL::libcurl>)
$<TARGET_FILE:CURL::libcurl_shared>)
endif()

if(WITH_OTLP_GRPC)
Expand All @@ -432,10 +432,8 @@ if(WIN32)
set(OPENSSL_DLL libssl-3-x64.dll)
set(OPENSSL_CRYPTO_DLL libcrypto-3-x64.dll)
set(OPENTELEMETRY_PROXY_RUNTIME_LIBRARIES ${OPENTELEMETRY_PROXY_RUNTIME_LIBRARIES}
$<TARGET_FILE:c-ares::cares>
$<TARGET_FILE_DIR:OpenSSL::SSL>/../bin/${OPENSSL_DLL}
$<TARGET_FILE_DIR:OpenSSL::SSL>/../bin/${OPENSSL_CRYPTO_DLL}
$<TARGET_FILE:re2::re2>)
$<TARGET_FILE_DIR:OpenSSL::SSL>/../bin/${OPENSSL_CRYPTO_DLL})
endif()
else()
set(OTEL_CPP_RUNTIME ${OTEL_CPP_PREFIX}/lib/libopentelemetry_proto${CMAKE_SHARED_LIBRARY_SUFFIX})
Expand Down
5 changes: 3 additions & 2 deletions cmake/vcpkg_triplets/x64-windows-otel-matlab.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
set(VCPKG_TARGET_ARCHITECTURE x64)
set(VCPKG_CRT_LINKAGE dynamic)
# Conflict with abseil_dll.dll used by Simulink. Use static library to avoid conflict.
if(${PORT} MATCHES "abseil")
# Conflict with abseil_dll.dll used by Simulink. cares.dll and re2.dll are also shipped with MATLAB.
# Use static libraries to avoid conflict.
if(${PORT} MATCHES "(abseil|c-ares|re2)")
set(VCPKG_LIBRARY_LINKAGE static)
else()
set(VCPKG_LIBRARY_LINKAGE dynamic)
Expand Down
2 changes: 1 addition & 1 deletion vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,5 @@
]
}
},
"builtin-baseline": "638b1588be3a265a9c7ad5b212cef72a1cad336a"
"builtin-baseline": "f7423ee180c4b7f40d43402c2feb3859161ef625"
}
Loading