Skip to content

Commit 4ecf53b

Browse files
committed
Add ZLIB to install on Mac
2 parents 171a2a5 + ad63937 commit 4ecf53b

File tree

1 file changed

+10
-6
lines changed

1 file changed

+10
-6
lines changed

CMakeLists.txt

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -226,8 +226,8 @@ set(OPENTELEMETRY_PROXY_LIBRARY_NAME "OtelMatlabProxy")
226226
find_package(Matlab REQUIRED)
227227
find_package(Protobuf REQUIRED)
228228
find_package(nlohmann_json REQUIRED)
229-
if(WIN32)
230-
find_package(zlib REQUIRED)
229+
if(WIN32 OR APPLE)
230+
find_package(ZLIB REQUIRED)
231231
endif()
232232

233233
if(WITH_OTLP_HTTP)
@@ -407,12 +407,16 @@ if(WIN32)
407407
$<TARGET_FILE_DIR:OpenSSL::SSL>/../bin/${OPENSSL_CRYPTO_DLL}
408408
$<TARGET_FILE:re2::re2>)
409409
endif()
410-
elseif(UNIX AND NOT CYGWIN)
410+
else()
411+
set(OTEL_CPP_RUNTIME ${OTEL_CPP_PREFIX}/lib/libopentelemetry_proto${CMAKE_SHARED_LIBRARY_SUFFIX})
411412
if(WITH_OTLP_GRPC)
412-
set(OTEL_CPP_RUNTIME ${OTEL_CPP_PREFIX}/lib/libopentelemetry_proto${CMAKE_SHARED_LIBRARY_SUFFIX}
413+
set(OTEL_CPP_RUNTIME ${OTEL_CPP_RUNTIME}
413414
${OTEL_CPP_PREFIX}/lib/libopentelemetry_proto_grpc${CMAKE_SHARED_LIBRARY_SUFFIX})
414-
else()
415-
set(OTEL_CPP_RUNTIME ${OTEL_CPP_PREFIX}/lib/libopentelemetry_proto${CMAKE_SHARED_LIBRARY_SUFFIX})
415+
endif()
416+
if(APPLE)
417+
set(OTEL_CPP_RUNTIME ${OTEL_CPP_RUNTIME} $<TARGET_FILE:ZLIB::ZLIB>
418+
$<TARGET_FILE_DIR:ZLIB::ZLIB>/libz.${ZLIB_MAJOR_VERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}
419+
$<TARGET_FILE_DIR:ZLIB::ZLIB>/libz.${ZLIB_VERSION}${CMAKE_SHARED_LIBRARY_SUFFIX})
416420
endif()
417421
set(OPENTELEMETRY_PROXY_RUNTIME_LIBRARIES ${OTEL_CPP_RUNTIME})
418422
endif()

0 commit comments

Comments
 (0)