Skip to content

Commit 97ea4d7

Browse files
author
Johannes Tax
authored
A little CMake cleanup (open-telemetry#48)
1 parent 94d1af4 commit 97ea4d7

File tree

2 files changed

+12
-41
lines changed

2 files changed

+12
-41
lines changed

api/test/nostd/CMakeLists.txt

+6-21
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,8 @@
11
include(GoogleTest)
22

3-
add_executable(string_view_test string_view_test.cc)
4-
target_link_libraries(string_view_test ${GTEST_BOTH_LIBRARIES}
5-
${CMAKE_THREAD_LIBS_INIT} opentelemetry_api)
6-
gtest_add_tests(TARGET string_view_test TEST_PREFIX nostd. TEST_LIST
7-
string_view_test)
8-
9-
add_executable(unique_ptr_test unique_ptr_test.cc)
10-
target_link_libraries(unique_ptr_test ${GTEST_BOTH_LIBRARIES}
11-
${CMAKE_THREAD_LIBS_INIT} opentelemetry_api)
12-
gtest_add_tests(TARGET unique_ptr_test TEST_PREFIX nostd. TEST_LIST
13-
unique_ptr_test)
14-
15-
add_executable(utility_test utility_test.cc)
16-
target_link_libraries(utility_test ${GTEST_BOTH_LIBRARIES}
17-
${CMAKE_THREAD_LIBS_INIT} opentelemetry_api)
18-
gtest_add_tests(TARGET utility_test TEST_PREFIX nostd. TEST_LIST utility_test)
19-
20-
add_executable(span_test span_test.cc)
21-
target_link_libraries(span_test ${GTEST_BOTH_LIBRARIES}
22-
${CMAKE_THREAD_LIBS_INIT} opentelemetry_api)
23-
gtest_add_tests(TARGET span_test TEST_PREFIX nostd. TEST_LIST span_test)
3+
foreach(testname string_view_test unique_ptr_test utility_test span_test)
4+
add_executable(${testname} "${testname}.cc")
5+
target_link_libraries(${testname} ${GTEST_BOTH_LIBRARIES}
6+
${CMAKE_THREAD_LIBS_INIT} opentelemetry_api)
7+
gtest_add_tests(TARGET ${testname} TEST_PREFIX nostd. TEST_LIST ${testname})
8+
endforeach()

api/test/trace/CMakeLists.txt

+6-20
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,10 @@
1-
add_executable(noop_test noop_test.cc)
2-
target_link_libraries(noop_test ${GTEST_BOTH_LIBRARIES}
3-
${CMAKE_THREAD_LIBS_INIT} opentelemetry_api)
4-
gtest_add_tests(TARGET noop_test TEST_PREFIX trace. TEST_LIST noop_test)
1+
foreach(testname noop_test span_id_test trace_id_test trace_flags_test)
2+
add_executable(${testname} "${testname}.cc")
3+
target_link_libraries(${testname} ${GTEST_BOTH_LIBRARIES}
4+
${CMAKE_THREAD_LIBS_INIT} opentelemetry_api)
5+
gtest_add_tests(TARGET ${testname} TEST_PREFIX trace. TEST_LIST ${testname})
6+
endforeach()
57

68
add_executable(span_id_benchmark span_id_benchmark.cc)
79
target_link_libraries(span_id_benchmark benchmark::benchmark
810
${CMAKE_THREAD_LIBS_INIT} opentelemetry_api)
9-
10-
add_executable(span_id_test span_id_test.cc)
11-
target_link_libraries(span_id_test ${GTEST_BOTH_LIBRARIES}
12-
${CMAKE_THREAD_LIBS_INIT} opentelemetry_api)
13-
gtest_add_tests(TARGET span_id_test TEST_PREFIX trace. TEST_LIST span_id_test)
14-
15-
add_executable(trace_id_test trace_id_test.cc)
16-
target_link_libraries(trace_id_test ${GTEST_BOTH_LIBRARIES}
17-
${CMAKE_THREAD_LIBS_INIT} opentelemetry_api)
18-
gtest_add_tests(TARGET trace_id_test TEST_PREFIX trace. TEST_LIST trace_id_test)
19-
20-
add_executable(trace_flags_test trace_flags_test.cc)
21-
target_link_libraries(trace_flags_test ${GTEST_BOTH_LIBRARIES}
22-
${CMAKE_THREAD_LIBS_INIT} opentelemetry_api)
23-
gtest_add_tests(TARGET trace_flags_test TEST_PREFIX trace. TEST_LIST
24-
trace_flags_test)

0 commit comments

Comments
 (0)