File tree Expand file tree Collapse file tree 3 files changed +5
-1
lines changed Expand file tree Collapse file tree 3 files changed +5
-1
lines changed Original file line number Diff line number Diff line change @@ -195,6 +195,8 @@ if(NOT DEFINED OTEL_CPP_INSTALLED_DIR)
195195
196196 set (OTEL_CPP_CXX_STANDARD 14)
197197
198+ set (OTEL_ABI_VERSION OPENTELEMETRY_ABI_VERSION_NO=2)
199+
198200 set (PATCHES_DIR ${CMAKE_SOURCE_DIR} /patches)
199201 if (SKIP_OTEL_CPP_PATCH)
200202 set (patch_comand "" )
@@ -366,7 +368,7 @@ if(WITH_OTLP_FILE)
366368 target_compile_definitions (${OPENTELEMETRY_PROXY_LIBRARY_NAME} PRIVATE WITH_OTLP_FILE)
367369endif ()
368370
369- target_compile_definitions (${OPENTELEMETRY_PROXY_LIBRARY_NAME} PRIVATE OPENTELEMETRY_ABI_VERSION_NO=2 )
371+ target_compile_definitions (${OPENTELEMETRY_PROXY_LIBRARY_NAME} PRIVATE ${OTEL_ABI_VERSION} )
370372
371373# pass in version number
372374target_compile_definitions (${OPENTELEMETRY_PROXY_LIBRARY_NAME} PRIVATE OTEL_MATLAB_VERSION="${OTEL_MATLAB_VERSION} " )
Original file line number Diff line number Diff line change @@ -8,6 +8,7 @@ if(NOT DEFINED OTEL_CPP_INSTALLED_DIR)
88 add_dependencies (${CONTEXTPROP_EXAMPLE_CPP_TARGET} ${OTEL_CPP_PROJECT_NAME} )
99endif ()
1010
11+ target_compile_definitions (${CONTEXTPROP_EXAMPLE_CPP_TARGET} PRIVATE ${OTEL_ABI_VERSION} )
1112target_include_directories (${CONTEXTPROP_EXAMPLE_CPP_TARGET} PRIVATE ${OTEL_CPP_PREFIX} /include )
1213target_link_libraries (${CONTEXTPROP_EXAMPLE_CPP_TARGET} PRIVATE ${OPENTELEMETRY_PROXY_LINK_LIBRARIES} )
1314if (UNIX AND NOT APPLE AND NOT CYGWIN )
Original file line number Diff line number Diff line change @@ -5,6 +5,7 @@ if(NOT DEFINED OTEL_CPP_INSTALLED_DIR)
55 add_dependencies (${WEBREAD_EXAMPLE_TARGET} ${OTEL_CPP_PROJECT_NAME} )
66endif ()
77
8+ target_compile_definitions (${WEBREAD_EXAMPLE_TARGET} PRIVATE ${OTEL_ABI_VERSION} )
89target_include_directories (${WEBREAD_EXAMPLE_TARGET} PRIVATE ${OTEL_CPP_PREFIX} /include )
910target_link_libraries (${WEBREAD_EXAMPLE_TARGET} PRIVATE ${OPENTELEMETRY_PROXY_LINK_LIBRARIES} )
1011if (UNIX AND NOT APPLE AND NOT CYGWIN )
You can’t perform that action at this time.
0 commit comments