Skip to content

Commit b22b907

Browse files
Levi ArmstrongLevi-Armstrong
authored andcommitted
Update to use initialize_code_coverage() macro and compiler definition
1 parent 332e568 commit b22b907

File tree

27 files changed

+76
-68
lines changed

27 files changed

+76
-68
lines changed

.github/workflows/codecov.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
DOCKER_IMAGE: "rosindustrial/tesseract:melodic"
2626
CCACHE_DIR: "/home/runner/work/tesseract/tesseract/CodeCov/.ccache"
2727
UPSTREAM_CMAKE_ARGS: "-DCMAKE_BUILD_TYPE=Release"
28-
TARGET_CMAKE_ARGS: "-DCMAKE_BUILD_TYPE=Debug -DTESSERACT_ENABLE_TESTING=ON -DTESSERACT_CODE_COVERAGE=ON"
28+
TARGET_CMAKE_ARGS: "-DCMAKE_BUILD_TYPE=Debug -DTESSERACT_ENABLE_CODE_COVERAGE=ON"
2929
AFTER_SCRIPT: 'catkin build -w $target_ws --no-deps --verbose tesseract_collision tesseract_common tesseract_environment tesseract_geometry tesseract_kinematics tesseract_motion_planners tesseract_scene_graph tesseract_urdf --make-args ccov-all
3030
&& bash <(curl -s https://codecov.io/bash) -t c4af0da7-9fc3-4d3c-bb2e-6b2523ddd382 -s $target_ws/build -f *all-merged.info'
3131
steps:

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ Tesseract packages use ctest because it is ROS agnostic, so to run the test call
8686

8787
### Building Tesseract Code Coverage
8888

89-
Must pass the -DTESSERACT_CODE_COVERAGE=ON to cmake when wanting to build code coverage. The code coverage report is located in each individuals build directory inside a ccov/all-merged folder. Open the index.html file to see the packages code coverage report.
89+
Must pass the -DTESSERACT_ENABLE_CODE_COVERAGE=ON to cmake when wanting to build code coverage. The code coverage report is located in each individuals build directory inside a ccov/all-merged folder. Open the index.html file to see the packages code coverage report.
9090

9191
NOTE: Must be a clean build when generating a code coverage report. Also must build in debug.
9292

tesseract/tesseract_collision/CMakeLists.txt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ if(NOT TARGET octomath)
4848
set_target_properties(octomath PROPERTIES INTERFACE_LINK_LIBRARIES "${OCTOMAP_LIBRARIES}")
4949
endif()
5050

51+
initialize_code_coverage()
5152
set(COVERAGE_EXCLUDE /usr/* /opt/* ${CMAKE_CURRENT_LIST_DIR}/test/* ${CMAKE_CURRENT_LIST_DIR}/include/tesseract_collision/test_suite/* /*/gtest/* /*/bullet/LinearMath/* /*/bullet/BulletCollision/* /*/include/ccd/* /*/include/fcl/*)
52-
5353
add_code_coverage_all_targets(EXCLUDE ${COVERAGE_EXCLUDE})
5454

5555
# Load variable for clang tidy args, compiler options and cxx version
@@ -62,7 +62,7 @@ target_compile_options(${PROJECT_NAME}_core INTERFACE ${TESSERACT_COMPILE_OPTION
6262
target_compile_definitions(${PROJECT_NAME}_core INTERFACE ${TESSERACT_COMPILE_DEFINITIONS} ${BULLET_DEFINITIONS})
6363
target_clang_tidy(${PROJECT_NAME}_core ARGUMENTS ${TESSERACT_CLANG_TIDY_ARGS} ENABLE ${TESSERACT_ENABLE_CLANG_TIDY})
6464
target_cxx_version(${PROJECT_NAME}_core INTERFACE VERSION ${TESSERACT_CXX_VERSION})
65-
target_code_coverage(${PROJECT_NAME}_core INTERFACE ALL EXCLUDE ${COVERAGE_EXCLUDE} ENABLE ${TESSERACT_ENABLE_TESTING})
65+
target_code_coverage(${PROJECT_NAME}_core INTERFACE ALL EXCLUDE ${COVERAGE_EXCLUDE} ENABLE ${TESSERACT_ENABLE_CODE_COVERAGE})
6666
target_include_directories(${PROJECT_NAME}_core INTERFACE
6767
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
6868
"$<INSTALL_INTERFACE:include>")
@@ -91,7 +91,7 @@ target_compile_options(${PROJECT_NAME}_bullet PUBLIC ${TESSERACT_COMPILE_OPTIONS
9191
target_compile_definitions(${PROJECT_NAME}_bullet PUBLIC ${TESSERACT_COMPILE_DEFINITIONS} ${BULLET_DEFINITIONS})
9292
target_clang_tidy(${PROJECT_NAME}_bullet ARGUMENTS ${TESSERACT_CLANG_TIDY_ARGS} ENABLE ${TESSERACT_ENABLE_CLANG_TIDY})
9393
target_cxx_version(${PROJECT_NAME}_bullet PUBLIC VERSION ${TESSERACT_CXX_VERSION})
94-
target_code_coverage(${PROJECT_NAME}_bullet ALL EXCLUDE ${COVERAGE_EXCLUDE} ENABLE ${TESSERACT_ENABLE_TESTING})
94+
target_code_coverage(${PROJECT_NAME}_bullet ALL EXCLUDE ${COVERAGE_EXCLUDE} ENABLE ${TESSERACT_ENABLE_CODE_COVERAGE})
9595
target_include_directories(${PROJECT_NAME}_bullet PUBLIC
9696
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
9797
"$<INSTALL_INTERFACE:include>")
@@ -111,7 +111,7 @@ target_compile_options(${PROJECT_NAME}_fcl PUBLIC ${TESSERACT_COMPILE_OPTIONS_PU
111111
target_compile_definitions(${PROJECT_NAME}_fcl PUBLIC ${TESSERACT_COMPILE_DEFINITIONS} ${BULLET_DEFINITIONS})
112112
target_clang_tidy(${PROJECT_NAME}_fcl ARGUMENTS ${TESSERACT_CLANG_TIDY_ARGS} ENABLE ${TESSERACT_ENABLE_CLANG_TIDY})
113113
target_cxx_version(${PROJECT_NAME}_fcl PUBLIC VERSION ${TESSERACT_CXX_VERSION})
114-
target_code_coverage(${PROJECT_NAME}_fcl ALL EXCLUDE ${COVERAGE_EXCLUDE} ENABLE ${TESSERACT_ENABLE_TESTING})
114+
target_code_coverage(${PROJECT_NAME}_fcl ALL EXCLUDE ${COVERAGE_EXCLUDE} ENABLE ${TESSERACT_ENABLE_CODE_COVERAGE})
115115
target_include_directories(${PROJECT_NAME}_fcl PUBLIC
116116
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
117117
"$<INSTALL_INTERFACE:include>")
@@ -127,7 +127,7 @@ target_compile_options(${PROJECT_NAME}_profile PRIVATE ${TESSERACT_COMPILE_OPTIO
127127
target_compile_definitions(${PROJECT_NAME}_profile INTERFACE ${TESSERACT_COMPILE_DEFINITIONS})
128128
target_clang_tidy(${PROJECT_NAME}_profile ARGUMENTS ${TESSERACT_CLANG_TIDY_ARGS} ENABLE ${TESSERACT_ENABLE_CLANG_TIDY})
129129
target_cxx_version(${PROJECT_NAME}_profile PRIVATE VERSION ${TESSERACT_CXX_VERSION})
130-
target_code_coverage(${PROJECT_NAME}_profile PRIVATE ALL EXCLUDE ${COVERAGE_EXCLUDE} ENABLE ${TESSERACT_ENABLE_TESTING})
130+
target_code_coverage(${PROJECT_NAME}_profile PRIVATE ALL EXCLUDE ${COVERAGE_EXCLUDE} ENABLE ${TESSERACT_ENABLE_CODE_COVERAGE})
131131

132132
# Create test suite interface
133133
add_library(${PROJECT_NAME}_test_suite INTERFACE)
@@ -136,7 +136,7 @@ target_compile_options(${PROJECT_NAME}_test_suite INTERFACE ${TESSERACT_COMPILE_
136136
target_compile_definitions(${PROJECT_NAME}_test_suite INTERFACE ${TESSERACT_COMPILE_DEFINITIONS})
137137
target_clang_tidy(${PROJECT_NAME}_test_suite ARGUMENTS ${TESSERACT_CLANG_TIDY_ARGS} ENABLE ${TESSERACT_ENABLE_CLANG_TIDY})
138138
target_cxx_version(${PROJECT_NAME}_test_suite INTERFACE VERSION ${TESSERACT_CXX_VERSION})
139-
target_code_coverage(${PROJECT_NAME}_test_suite INTERFACE ALL EXCLUDE ${COVERAGE_EXCLUDE} ENABLE ${TESSERACT_ENABLE_TESTING})
139+
target_code_coverage(${PROJECT_NAME}_test_suite INTERFACE ALL EXCLUDE ${COVERAGE_EXCLUDE} ENABLE ${TESSERACT_ENABLE_CODE_COVERAGE})
140140
target_include_directories(${PROJECT_NAME}_test_suite INTERFACE
141141
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
142142
"$<INSTALL_INTERFACE:include>")
@@ -149,7 +149,7 @@ target_link_libraries(${PROJECT_NAME}_test_suite_benchmarks INTERFACE tesseract:
149149
target_compile_options(${PROJECT_NAME}_test_suite_benchmarks INTERFACE ${TESSERACT_COMPILE_OPTIONS_PUBLIC})
150150
target_clang_tidy(${PROJECT_NAME}_test_suite_benchmarks ARGUMENTS ${TESSERACT_CLANG_TIDY_ARGS} ENABLE ${TESSERACT_ENABLE_CLANG_TIDY})
151151
target_cxx_version(${PROJECT_NAME}_test_suite_benchmarks INTERFACE VERSION ${TESSERACT_CXX_VERSION})
152-
target_code_coverage(${PROJECT_NAME}_test_suite_benchmarks INTERFACE ALL EXCLUDE ${COVERAGE_EXCLUDE} ENABLE ${TESSERACT_ENABLE_TESTING})
152+
target_code_coverage(${PROJECT_NAME}_test_suite_benchmarks INTERFACE ALL EXCLUDE ${COVERAGE_EXCLUDE} ENABLE ${TESSERACT_ENABLE_CODE_COVERAGE})
153153
target_include_directories(${PROJECT_NAME}_test_suite_benchmarks INTERFACE
154154
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
155155
"$<INSTALL_INTERFACE:include>")

tesseract/tesseract_collision/test/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ macro(add_gtest test_name test_file)
4646
target_compile_definitions(${test_name} PRIVATE ${TESSERACT_COMPILE_DEFINITIONS})
4747
target_clang_tidy(${test_name} ARGUMENTS ${TESSERACT_CLANG_TIDY_ARGS} ENABLE ${TESSERACT_ENABLE_CLANG_TIDY})
4848
target_cxx_version(${test_name} PRIVATE VERSION ${TESSERACT_CXX_VERSION})
49-
target_code_coverage(${test_name} ALL EXCLUDE ${COVERAGE_EXCLUDE} ENABLE ${TESSERACT_ENABLE_TESTING})
49+
target_code_coverage(${test_name} ALL EXCLUDE ${COVERAGE_EXCLUDE} ENABLE ${TESSERACT_ENABLE_CODE_COVERAGE})
5050
add_gtest_discover_tests(${test_name})
5151
add_dependencies(${test_name} ${PROJECT_NAME}_core ${PROJECT_NAME}_test_suite ${PROJECT_NAME}_bullet ${PROJECT_NAME}_fcl)
5252
add_dependencies(run_tests ${test_name})

tesseract/tesseract_common/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ else()
2828
endif()
2929
endif()
3030

31+
initialize_code_coverage()
3132
set(COVERAGE_EXCLUDE /usr/* /opt/* ${CMAKE_CURRENT_LIST_DIR}/test/* /*/gtest/*)
32-
3333
add_code_coverage_all_targets(EXCLUDE ${COVERAGE_EXCLUDE})
3434

3535
# Load variable for clang tidy args, compiler options and cxx version
@@ -41,7 +41,7 @@ target_compile_options(${PROJECT_NAME} PUBLIC ${TESSERACT_COMPILE_OPTIONS_PUBLIC
4141
target_compile_definitions(${PROJECT_NAME} PUBLIC ${TESSERACT_COMPILE_DEFINITIONS})
4242
target_clang_tidy(${PROJECT_NAME} ARGUMENTS ${TESSERACT_CLANG_TIDY_ARGS} ENABLE ${TESSERACT_ENABLE_CLANG_TIDY})
4343
target_cxx_version(${PROJECT_NAME} PUBLIC VERSION ${TESSERACT_CXX_VERSION})
44-
target_code_coverage(${PROJECT_NAME} PRIVATE ALL EXCLUDE ${COVERAGE_EXCLUDE} ENABLE ${TESSERACT_ENABLE_TESTING})
44+
target_code_coverage(${PROJECT_NAME} PRIVATE ALL EXCLUDE ${COVERAGE_EXCLUDE} ENABLE ${TESSERACT_ENABLE_CODE_COVERAGE})
4545
target_include_directories(${PROJECT_NAME} PUBLIC
4646
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
4747
"$<INSTALL_INTERFACE:include>")

tesseract/tesseract_common/cmake/tesseract_macros.cmake

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,12 @@ macro(tesseract_variables)
3232
set(TESSERACT_ENABLE_CLANG_TIDY OFF)
3333
endif()
3434

35+
if (NOT DEFINED TESSERACT_ENABLE_CODE_COVERAGE)
36+
set(TESSERACT_ENABLE_CODE_COVERAGE OFF)
37+
elseif(TESSERACT_ENABLE_CODE_COVERAGE)
38+
set(TESSERACT_ENABLE_TESTING ON)
39+
endif()
40+
3541
if (NOT DEFINED TESSERACT_ENABLE_TESTING)
3642
set(TESSERACT_ENABLE_TESTING OFF)
3743
endif()
@@ -43,6 +49,7 @@ macro(tesseract_variables)
4349
if (TESSERACT_ENABLE_TESTING_ALL)
4450
set(TESSERACT_ENABLE_TESTING ON)
4551
set(TESSERACT_ENABLE_CLANG_TIDY ON)
52+
set(TESSERACT_ENABLE_CODE_COVERAGE ON)
4653
endif()
4754

4855
set(TESSERACT_COMPILE_DEFINITIONS "")

tesseract/tesseract_common/test/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ target_compile_options(${PROJECT_NAME}_unit PRIVATE ${TESSERACT_COMPILE_OPTIONS_
3636
target_compile_definitions(${PROJECT_NAME}_unit PRIVATE ${TESSERACT_COMPILE_DEFINITIONS})
3737
target_clang_tidy(${PROJECT_NAME}_unit ARGUMENTS ${TESSERACT_CLANG_TIDY_ARGS} ENABLE ${TESSERACT_ENABLE_CLANG_TIDY})
3838
target_cxx_version(${PROJECT_NAME}_unit PUBLIC VERSION ${TESSERACT_CXX_VERSION})
39-
target_code_coverage(${PROJECT_NAME}_unit ALL EXCLUDE ${COVERAGE_EXCLUDE} ENABLE ${TESSERACT_ENABLE_TESTING})
39+
target_code_coverage(${PROJECT_NAME}_unit ALL EXCLUDE ${COVERAGE_EXCLUDE} ENABLE ${TESSERACT_ENABLE_CODE_COVERAGE})
4040
add_gtest_discover_tests(${PROJECT_NAME}_unit)
4141
add_dependencies(${PROJECT_NAME}_unit ${PROJECT_NAME})
4242
add_dependencies(run_tests ${PROJECT_NAME}_unit)
@@ -47,7 +47,7 @@ target_compile_options(${PROJECT_NAME}_clone_cache_unit PRIVATE ${TESSERACT_COMP
4747
target_compile_definitions(${PROJECT_NAME}_clone_cache_unit PRIVATE ${TESSERACT_COMPILE_DEFINITIONS})
4848
target_clang_tidy(${PROJECT_NAME}_clone_cache_unit ARGUMENTS ${TESSERACT_CLANG_TIDY_ARGS} ENABLE ${TESSERACT_ENABLE_CLANG_TIDY})
4949
target_cxx_version(${PROJECT_NAME}_clone_cache_unit PUBLIC VERSION ${TESSERACT_CXX_VERSION})
50-
target_code_coverage(${PROJECT_NAME}_clone_cache_unit ALL EXCLUDE ${COVERAGE_EXCLUDE} ENABLE ${TESSERACT_ENABLE_TESTING})
50+
target_code_coverage(${PROJECT_NAME}_clone_cache_unit ALL EXCLUDE ${COVERAGE_EXCLUDE} ENABLE ${TESSERACT_ENABLE_CODE_COVERAGE})
5151
add_gtest_discover_tests(${PROJECT_NAME}_clone_cache_unit)
5252
add_dependencies(${PROJECT_NAME}_clone_cache_unit ${PROJECT_NAME})
5353
add_dependencies(run_tests ${PROJECT_NAME}_clone_cache_unit)

tesseract/tesseract_environment/CMakeLists.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ else()
3030
endif()
3131
endif()
3232

33+
initialize_code_coverage()
3334
set(COVERAGE_EXCLUDE /usr/* /opt/* ${CMAKE_CURRENT_LIST_DIR}/test/* /*/gtest/* /*/bullet/LinearMath/* /*/bullet/BulletCollision/*)
34-
3535
add_code_coverage_all_targets(EXCLUDE ${COVERAGE_EXCLUDE})
3636

3737
# Load variable for clang tidy args, compiler options and cxx version
@@ -52,7 +52,7 @@ target_compile_options(${PROJECT_NAME}_core PUBLIC ${TESSERACT_COMPILE_OPTIONS_P
5252
target_compile_definitions(${PROJECT_NAME}_core PUBLIC ${TESSERACT_COMPILE_DEFINITIONS})
5353
target_clang_tidy(${PROJECT_NAME}_core ARGUMENTS ${TESSERACT_CLANG_TIDY_ARGS} ENABLE ${TESSERACT_ENABLE_CLANG_TIDY})
5454
target_cxx_version(${PROJECT_NAME}_core PUBLIC VERSION ${TESSERACT_CXX_VERSION})
55-
target_code_coverage(${PROJECT_NAME}_core ALL EXCLUDE ${COVERAGE_EXCLUDE} ENABLE ${TESSERACT_ENABLE_TESTING})
55+
target_code_coverage(${PROJECT_NAME}_core ALL EXCLUDE ${COVERAGE_EXCLUDE} ENABLE ${TESSERACT_ENABLE_CODE_COVERAGE})
5656
target_include_directories(${PROJECT_NAME}_core PUBLIC
5757
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
5858
"$<INSTALL_INTERFACE:include>")
@@ -66,7 +66,7 @@ target_compile_options(${PROJECT_NAME}_kdl PUBLIC ${TESSERACT_COMPILE_OPTIONS_PU
6666
target_compile_definitions(${PROJECT_NAME}_kdl PUBLIC ${TESSERACT_COMPILE_DEFINITIONS})
6767
target_clang_tidy(${PROJECT_NAME}_kdl ARGUMENTS ${TESSERACT_CLANG_TIDY_ARGS} ENABLE ${TESSERACT_ENABLE_CLANG_TIDY})
6868
target_cxx_version(${PROJECT_NAME}_kdl PUBLIC VERSION ${TESSERACT_CXX_VERSION})
69-
target_code_coverage(${PROJECT_NAME}_kdl ALL EXCLUDE ${COVERAGE_EXCLUDE} ENABLE ${TESSERACT_ENABLE_TESTING})
69+
target_code_coverage(${PROJECT_NAME}_kdl ALL EXCLUDE ${COVERAGE_EXCLUDE} ENABLE ${TESSERACT_ENABLE_CODE_COVERAGE})
7070
target_include_directories(${PROJECT_NAME}_kdl PUBLIC
7171
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
7272
"$<INSTALL_INTERFACE:include>")
@@ -81,14 +81,14 @@ target_compile_options(${PROJECT_NAME}_ofkt PUBLIC ${TESSERACT_COMPILE_OPTIONS_P
8181
target_compile_definitions(${PROJECT_NAME}_ofkt PUBLIC ${TESSERACT_COMPILE_DEFINITIONS})
8282
target_clang_tidy(${PROJECT_NAME}_ofkt ARGUMENTS ${TESSERACT_CLANG_TIDY_ARGS} ENABLE ${TESSERACT_ENABLE_CLANG_TIDY})
8383
target_cxx_version(${PROJECT_NAME}_ofkt PUBLIC VERSION ${TESSERACT_CXX_VERSION})
84-
target_code_coverage(${PROJECT_NAME}_ofkt ALL EXCLUDE ${COVERAGE_EXCLUDE} ENABLE ${TESSERACT_ENABLE_TESTING})
84+
target_code_coverage(${PROJECT_NAME}_ofkt ALL EXCLUDE ${COVERAGE_EXCLUDE} ENABLE ${TESSERACT_ENABLE_CODE_COVERAGE})
8585
target_include_directories(${PROJECT_NAME}_ofkt PUBLIC
8686
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
8787
"$<INSTALL_INTERFACE:include>")
8888
target_include_directories(${PROJECT_NAME}_ofkt SYSTEM PUBLIC
8989
${EIGEN3_INCLUDE_DIRS})
9090

91-
configure_package(NAMESPACE tesseract TARGETS ${PROJECT_NAME}_core ${PROJECT_NAME}_kdl ${PROJECT_NAME}_ofkt)
91+
configure_package(NAMESPACE tesseract TARGETS ${PROJECT_NAME}_core ${PROJECT_NAME}_kdl ${PROJECT_NAME}_ofkt)
9292

9393
# Mark cpp header files for installation
9494
install(DIRECTORY include/${PROJECT_NAME}

tesseract/tesseract_environment/test/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ target_compile_options(${PROJECT_NAME}_unit PRIVATE ${TESSERACT_COMPILE_OPTIONS_
3737
target_compile_definitions(${PROJECT_NAME}_unit PRIVATE ${TESSERACT_COMPILE_DEFINITIONS})
3838
target_clang_tidy(${PROJECT_NAME}_unit ARGUMENTS ${TESSERACT_CLANG_TIDY_ARGS} ENABLE ${TESSERACT_ENABLE_CLANG_TIDY})
3939
target_cxx_version(${PROJECT_NAME}_unit PRIVATE VERSION ${TESSERACT_CXX_VERSION})
40-
target_code_coverage(${PROJECT_NAME}_unit ALL EXCLUDE ${COVERAGE_EXCLUDE} ENABLE ${TESSERACT_ENABLE_TESTING})
40+
target_code_coverage(${PROJECT_NAME}_unit ALL EXCLUDE ${COVERAGE_EXCLUDE} ENABLE ${TESSERACT_ENABLE_CODE_COVERAGE})
4141
target_include_directories(${PROJECT_NAME}_unit PRIVATE ${orocos_kdl_INCLUDE_DIRS})
4242
add_gtest_discover_tests(${PROJECT_NAME}_unit)
4343
add_dependencies(${PROJECT_NAME}_unit ${PROJECT_NAME}_kdl)

tesseract/tesseract_geometry/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ if(NOT TARGET octomath)
4141
set_target_properties(octomath PROPERTIES INTERFACE_LINK_LIBRARIES "${OCTOMAP_LIBRARIES}")
4242
endif()
4343

44+
initialize_code_coverage()
4445
set(COVERAGE_EXCLUDE /usr/* /opt/* ${CMAKE_CURRENT_LIST_DIR}/test/* /*/gtest/*)
45-
4646
add_code_coverage_all_targets(EXCLUDE ${COVERAGE_EXCLUDE})
4747

4848
# Load variable for clang tidy args, compiler options and cxx version
@@ -54,7 +54,7 @@ target_compile_options(${PROJECT_NAME} INTERFACE ${TESSERACT_COMPILE_OPTIONS_PUB
5454
target_compile_definitions(${PROJECT_NAME} INTERFACE ${TESSERACT_COMPILE_DEFINITIONS})
5555
target_clang_tidy(${PROJECT_NAME} ARGUMENTS ${TESSERACT_CLANG_TIDY_ARGS} ENABLE ${TESSERACT_ENABLE_CLANG_TIDY})
5656
target_cxx_version(${PROJECT_NAME} INTERFACE VERSION ${TESSERACT_CXX_VERSION})
57-
target_code_coverage(${PROJECT_NAME} INTERFACE ALL EXCLUDE ${COVERAGE_EXCLUDE} ENABLE ${TESSERACT_ENABLE_TESTING})
57+
target_code_coverage(${PROJECT_NAME} INTERFACE ALL EXCLUDE ${COVERAGE_EXCLUDE} ENABLE ${TESSERACT_ENABLE_CODE_COVERAGE})
5858
target_include_directories(${PROJECT_NAME} INTERFACE
5959
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
6060
"$<INSTALL_INTERFACE:include>")

0 commit comments

Comments
 (0)