File tree Expand file tree Collapse file tree 3 files changed +20
-5
lines changed Expand file tree Collapse file tree 3 files changed +20
-5
lines changed Original file line number Diff line number Diff line change @@ -346,7 +346,6 @@ elseif(UNIX AND NOT CYGWIN)
346346 set (OPENTELEMETRY_PROXY_RUNTIME_LIBRARIES ${OTEL_CPP_RUNTIME} )
347347endif ()
348348
349-
350349# ##############################
351350# OpenTelemetry MEX Gateway
352351# ##############################
@@ -398,7 +397,8 @@ if(WITH_OTLP_GRPC)
398397endif ()
399398
400399# Install dependent runtime libraries
401- install (FILES ${OPENTELEMETRY_PROXY_RUNTIME_LIBRARIES} DESTINATION +libmexclass/+proxy)
400+ set (LIBMEXCLASS_PROXY_INSTALLED_DIR +libmexclass/+proxy)
401+ install (FILES ${OPENTELEMETRY_PROXY_RUNTIME_LIBRARIES} DESTINATION ${LIBMEXCLASS_PROXY_INSTALLED_DIR} )
402402
403403# ##############################
404404# Subdirectories
Original file line number Diff line number Diff line change @@ -5,6 +5,13 @@ add_executable(${CONTEXTPROP_EXAMPLE_TARGET} cpp/client.cc)
55
66target_include_directories (${CONTEXTPROP_EXAMPLE_TARGET} PRIVATE ${OTEL_CPP_PREFIX} /include )
77target_link_libraries (${CONTEXTPROP_EXAMPLE_TARGET} PRIVATE ${OTEL_CPP_LINK_LIBRARIES} )
8+ if (UNIX AND NOT APPLE AND NOT CYGWIN )
9+ target_link_options (${CONTEXTPROP_EXAMPLE_TARGET} PRIVATE ${OPENTELEMETRY_PROXY_LINK_OPTIONS} )
10+ elseif (APPLE )
11+ set_target_properties (${CONTEXTPROP_EXAMPLE_TARGET} PROPERTIES BUILD_RPATH "${CMAKE_INSTALL_PREFIX} /${LIBMEXCLASS_PROXY_INSTALLED_DIR} " )
12+ endif ()
13+ # use the same C++ standard as OpenTelemetry-cpp
14+ target_compile_features (${CONTEXTPROP_EXAMPLE_TARGET} PRIVATE cxx_std_${OTEL_CPP_CXX_STANDARD} )
815
916# MATLAB target
1017find_package (Matlab REQUIRED COMPONENTS MCC_COMPILER MAIN_PROGRAM)
Original file line number Diff line number Diff line change 11
2- add_executable (http_server cpp/server.cc)
2+ set (WEBREAD_EXAMPLE_TARGET webread_example_server)
3+ add_executable (${WEBREAD_EXAMPLE_TARGET} cpp/server.cc)
34
4- target_include_directories (http_server PRIVATE ${OTEL_CPP_PREFIX} /include )
5- target_link_libraries (http_server PRIVATE ${OTEL_CPP_LINK_LIBRARIES} )
5+ target_include_directories (${WEBREAD_EXAMPLE_TARGET} PRIVATE ${OTEL_CPP_PREFIX} /include )
6+ target_link_libraries (${WEBREAD_EXAMPLE_TARGET} PRIVATE ${OTEL_CPP_LINK_LIBRARIES} )
7+ if (UNIX AND NOT APPLE AND NOT CYGWIN )
8+ target_link_options (${WEBREAD_EXAMPLE_TARGET} PRIVATE ${OPENTELEMETRY_PROXY_LINK_OPTIONS} )
9+ elseif (APPLE )
10+ set_target_properties (${WEBREAD_EXAMPLE_TARGET} PROPERTIES BUILD_RPATH "${CMAKE_INSTALL_PREFIX} /${LIBMEXCLASS_PROXY_INSTALLED_DIR} " )
11+ endif ()
12+ # use the same C++ standard as OpenTelemetry-cpp
13+ target_compile_features (${WEBREAD_EXAMPLE_TARGET} PRIVATE cxx_std_${OTEL_CPP_CXX_STANDARD} )
You can’t perform that action at this time.
0 commit comments