update build for Mac OS

Author: duncanpo

CMakeLists.txt

@@ -64,11 +64,14 @@ else()
     set(OTEL_CPP_CXX_STANDARD 11)
 endif()
 
+set(patch_command git apply ${CMAKE_SOURCE_DIR}/otel-cpp.patch)
+
 ExternalProject_Add(
     ${OTEL_CPP_PROJECT_NAME}
     GIT_REPOSITORY ${OTEL_CPP_GIT_REPOSITORY}
     GIT_TAG ${OTEL_CPP_GIT_TAG}
     PREFIX ${OTEL_CPP_PREFIX}
+    PATCH_COMMAND ${patch_command}
     CMAKE_ARGS -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DWITH_OTLP_HTTP=${WITH_OTLP_HTTP} -DWITH_OTLP_GRPC=${WITH_OTLP_GRPC} -DBUILD_TESTING=OFF -DWITH_BENCHMARK=OFF -DOPENTELEMETRY_INSTALL=ON -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} -DCMAKE_CXX_STANDARD=${OTEL_CPP_CXX_STANDARD}
     INSTALL_DIR ${OTEL_CPP_PREFIX}
     INSTALL_COMMAND ${CMAKE_COMMAND} --install . --prefix ${OTEL_CPP_PREFIX}
@@ -243,11 +246,13 @@ if(WIN32)
             ${OPENSSL_RUNTIME}
             ${RE2_RUNTIME})
     endif()
-elseif(UNIX AND NOT APPLE AND NOT CYGWIN)
-    FILE(GLOB OTEL_CPP_RUNTIME ${OTEL_CPP_PREFIX}/lib/*.so)
-    set(OPENTELEMETRY_PROXY_RUNTIME_LIBRARIES ${OTEL_CPP_RUNTIME})
-elseif(APPLE)
-    FILE(GLOB OTEL_CPP_RUNTIME ${OTEL_CPP_PREFIX}/lib/*.dylib)
+elseif(UNIX AND NOT CYGWIN)
+    if(WITH_OTLP_GRPC)
+        set(OTEL_CPP_RUNTIME ${OTEL_CPP_PREFIX}/lib/libopentelemetry_proto${CMAKE_SHARED_LIBRARY_SUFFIX}
+                             ${OTEL_CPP_PREFIX}/lib/libopentelemetry_proto_grpc${CMAKE_SHARED_LIBRARY_SUFFIX})
+    else()
+        set(OTEL_CPP_RUNTIME ${OTEL_CPP_PREFIX}/lib/libopentelemetry_proto${CMAKE_SHARED_LIBRARY_SUFFIX})
+    endif()
     set(OPENTELEMETRY_PROXY_RUNTIME_LIBRARIES ${OTEL_CPP_RUNTIME})
 endif()
 

otel-cpp.patch

@@ -0,0 +1,13 @@
+diff --git a/cmake/opentelemetry-proto.cmake b/cmake/opentelemetry-proto.cmake
+index 22082356..e25a89a2 100644
+--- a/cmake/opentelemetry-proto.cmake
++++ b/cmake/opentelemetry-proto.cmake
+@@ -276,7 +276,7 @@ if(WITH_OTLP_GRPC)
+     PUBLIC opentelemetry_proto)
+ 
+   get_target_property(grpc_lib_type gRPC::grpc++ TYPE)
+-  if (grpc_lib_type STREQUAL "SHARED_LIBRARY")
++  if (grpc_lib_type STREQUAL "SHARED_LIBRARY" OR APPLE)
+     target_link_libraries(opentelemetry_proto_grpc
+       PUBLIC gRPC::grpc++)
+   endif()