File tree Expand file tree Collapse file tree 1 file changed +10
-6
lines changed Expand file tree Collapse file tree 1 file changed +10
-6
lines changed Original file line number Diff line number Diff line change @@ -225,8 +225,8 @@ set(OPENTELEMETRY_PROXY_LIBRARY_NAME "OtelMatlabProxy")
225225find_package (Matlab REQUIRED)
226226find_package (Protobuf REQUIRED)
227227find_package (nlohmann_json REQUIRED)
228- if (WIN32 )
229- find_package (zlib REQUIRED)
228+ if (WIN32 OR APPLE )
229+ find_package (ZLIB REQUIRED)
230230endif ()
231231
232232if (WITH_OTLP_HTTP)
@@ -406,12 +406,16 @@ if(WIN32)
406406 $<TARGET_FILE_DIR:OpenSSL::SSL>/../bin/${OPENSSL_CRYPTO_DLL}
407407 $<TARGET_FILE:re2::re2>)
408408 endif ()
409- elseif (UNIX AND NOT CYGWIN )
409+ else ()
410+ set (OTEL_CPP_RUNTIME ${OTEL_CPP_PREFIX} /lib/libopentelemetry_proto${CMAKE_SHARED_LIBRARY_SUFFIX} )
410411 if (WITH_OTLP_GRPC)
411- set (OTEL_CPP_RUNTIME ${OTEL_CPP_PREFIX} /lib/libopentelemetry_proto ${CMAKE_SHARED_LIBRARY_SUFFIX}
412+ set (OTEL_CPP_RUNTIME ${OTEL_CPP_RUNTIME}
412413 ${OTEL_CPP_PREFIX} /lib/libopentelemetry_proto_grpc${CMAKE_SHARED_LIBRARY_SUFFIX} )
413- else ()
414- set (OTEL_CPP_RUNTIME ${OTEL_CPP_PREFIX} /lib/libopentelemetry_proto${CMAKE_SHARED_LIBRARY_SUFFIX} )
414+ endif ()
415+ if (APPLE )
416+ set (OTEL_CPP_RUNTIME ${OTEL_CPP_RUNTIME} $<TARGET_FILE:ZLIB::ZLIB>
417+ $<TARGET_FILE_DIR:ZLIB::ZLIB>/libz.${ZLIB_MAJOR_VERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}
418+ $<TARGET_FILE_DIR:ZLIB::ZLIB>/libz.${ZLIB_VERSION}${CMAKE_SHARED_LIBRARY_SUFFIX} )
415419 endif ()
416420 set (OPENTELEMETRY_PROXY_RUNTIME_LIBRARIES ${OTEL_CPP_RUNTIME} )
417421endif ()
You can’t perform that action at this time.
0 commit comments