Skip to content

Commit

Permalink
fix cmake error when building without tests (open-telemetry#271)
Browse files Browse the repository at this point in the history
  • Loading branch information
BitFis authored Aug 12, 2020
1 parent 7e0287c commit 119e030
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 18 deletions.
26 changes: 14 additions & 12 deletions exporters/ostream/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,20 @@ include_directories(include)
add_library(opentelemetry_exporter_ostream_metrics src/metrics_exporter.cc)
add_library(opentelemetry_exporter_ostream_span src/span_exporter.cc)

add_executable(ostream_metrics_test test/ostream_metrics_test.cc)
add_executable(ostream_span_test test/ostream_span_test.cc)
if(BUILD_TESTING)
add_executable(ostream_metrics_test test/ostream_metrics_test.cc)
add_executable(ostream_span_test test/ostream_span_test.cc)

target_link_libraries(
ostream_span_test ${GTEST_BOTH_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}
opentelemetry_exporter_ostream_span)
target_link_libraries(
ostream_span_test ${GTEST_BOTH_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}
opentelemetry_exporter_ostream_span)

target_link_libraries(
ostream_metrics_test ${GTEST_BOTH_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}
opentelemetry_exporter_ostream_metrics)
target_link_libraries(
ostream_metrics_test ${GTEST_BOTH_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}
opentelemetry_exporter_ostream_metrics)

gtest_add_tests(TARGET ostream_metrics_test TEST_PREFIX exporter. TEST_LIST
ostream_metrics_test)
gtest_add_tests(TARGET ostream_span_test TEST_PREFIX exporter. TEST_LIST
ostream_span_test)
gtest_add_tests(TARGET ostream_metrics_test TEST_PREFIX exporter. TEST_LIST
ostream_metrics_test)
gtest_add_tests(TARGET ostream_span_test TEST_PREFIX exporter. TEST_LIST
ostream_span_test)
endif() # BUILD_TESTING
14 changes: 8 additions & 6 deletions exporters/otlp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,11 @@ add_library(opentelemetry_exporter_otprotocol src/recordable.cc)
target_link_libraries(opentelemetry_exporter_otprotocol
$<TARGET_OBJECTS:opentelemetry_proto>)

add_executable(recordable_test test/recordable_test.cc)
target_link_libraries(
recordable_test ${GTEST_BOTH_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}
opentelemetry_exporter_otprotocol protobuf::libprotobuf)
gtest_add_tests(TARGET recordable_test TEST_PREFIX exporter. TEST_LIST
recordable_test)
if(BUILD_TESTING)
add_executable(recordable_test test/recordable_test.cc)
target_link_libraries(
recordable_test ${GTEST_BOTH_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}
opentelemetry_exporter_otprotocol protobuf::libprotobuf)
gtest_add_tests(TARGET recordable_test TEST_PREFIX exporter. TEST_LIST
recordable_test)
endif() # BUILD_TESTING

0 comments on commit 119e030

Please sign in to comment.