Skip to content

Commit 7cdbe78

Browse files
author
Duncan Po
committed
use OpenSSL as shared libraries on Mac
1 parent 96949d0 commit 7cdbe78

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -446,7 +446,9 @@ else()
446446
if(APPLE)
447447
set(OTEL_CPP_RUNTIME ${OTEL_CPP_RUNTIME} $<TARGET_FILE:ZLIB::ZLIB>
448448
$<TARGET_FILE_DIR:ZLIB::ZLIB>/libz.${ZLIB_MAJOR_VERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}
449-
$<TARGET_FILE_DIR:ZLIB::ZLIB>/libz.${ZLIB_VERSION}${CMAKE_SHARED_LIBRARY_SUFFIX})
449+
$<TARGET_FILE_DIR:ZLIB::ZLIB>/libz.${ZLIB_VERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}
450+
$<TARGET_FILE_DIR:OpenSSL::SSL>/libssl.3${CMAKE_SHARED_LIBRARY_SUFFIX}
451+
$<TARGET_FILE_DIR:OpenSSL::Crypto>/libcrypto.3${CMAKE_SHARED_LIBRARY_SUFFIX})
450452
endif()
451453
set(OPENTELEMETRY_PROXY_RUNTIME_LIBRARIES ${OTEL_CPP_RUNTIME})
452454
endif()

cmake/vcpkg_triplets/arm64-osx-otel-matlab.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
set(VCPKG_TARGET_ARCHITECTURE arm64)
22
set(VCPKG_CRT_LINKAGE dynamic)
3-
if(${PORT} MATCHES "(curl|zlib)")
3+
if(${PORT} MATCHES "(curl|zlib|openssl)")
44
set(VCPKG_LIBRARY_LINKAGE dynamic)
55
else()
66
set(VCPKG_LIBRARY_LINKAGE static)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
set(VCPKG_TARGET_ARCHITECTURE x64)
22
set(VCPKG_CRT_LINKAGE dynamic)
3-
if(${PORT} MATCHES "(curl|zlib)")
3+
if(${PORT} MATCHES "(curl|zlib|openssl)")
44
set(VCPKG_LIBRARY_LINKAGE dynamic)
55
else()
66
set(VCPKG_LIBRARY_LINKAGE static)

0 commit comments

Comments
 (0)