Merge pull request #206 from mathworks/mac_dependencies_2

Update dependencies baseline

Author: duncanpo

CMakeLists.txt

@@ -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)
@@ -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})

cmake/vcpkg_triplets/x64-windows-otel-matlab.cmake

@@ -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)

vcpkg.json

@@ -25,5 +25,5 @@
       ]
     }
   },
-  "builtin-baseline": "638b1588be3a265a9c7ad5b212cef72a1cad336a"
+  "builtin-baseline": "f7423ee180c4b7f40d43402c2feb3859161ef625"
 }