Skip to content

Remove custom ament_cppcheck usage. #3398

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
clalancette merged 1 commit into from
Nov 2, 2026
Merged

Remove custom ament_cppcheck usage. #3398

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions rclcpp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,12 +266,8 @@ install(
DESTINATION include/${PROJECT_NAME}
)

if(TEST cppcheck)
# must set the property after ament_package()
set_tests_properties(cppcheck PROPERTIES TIMEOUT 1200)
endif()

if(TEST cpplint)
# must set the property after ament_package()
set_tests_properties(cpplint PROPERTIES TIMEOUT 180)
endif()

Expand Down
8 changes: 0 additions & 8 deletions rclcpp_action/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,6 @@ ament_export_dependencies(action_msgs rcl_action rclcpp rosidl_runtime_c)
if(BUILD_TESTING)
find_package(ament_cmake_gtest REQUIRED)
find_package(ament_lint_auto REQUIRED)
# Give cppcheck hints about macro definitions coming from outside this package
get_target_property(rclcpp_include_dirs rclcpp::rclcpp INTERFACE_INCLUDE_DIRECTORIES)
set(ament_cmake_cppcheck_ADDITIONAL_INCLUDE_DIRS ${rclcpp_include_dirs})
ament_lint_auto_find_test_dependencies()

add_subdirectory(test/benchmark)
Expand Down Expand Up @@ -160,8 +157,3 @@ if(BUILD_TESTING)
endif()

ament_package()

if(TEST cppcheck)
# must set the property after ament_package()
set_tests_properties(cppcheck PROPERTIES TIMEOUT 600)
endif()
2 changes: 0 additions & 2 deletions rclcpp_components/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,6 @@ if(BUILD_TESTING)
find_package(ament_lint_auto REQUIRED)
find_package(ament_cmake_google_benchmark REQUIRED)
find_package(benchmark REQUIRED)
# Give cppcheck hints about macro definitions coming from outside this package
get_target_property(ament_cmake_cppcheck_ADDITIONAL_INCLUDE_DIRS benchmark::benchmark INTERFACE_INCLUDE_DIRECTORIES)
ament_lint_auto_find_test_dependencies()

set(components "")
Expand Down
8 changes: 0 additions & 8 deletions rclcpp_lifecycle/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,16 +57,8 @@ install(DIRECTORY include/

if(BUILD_TESTING)
find_package(ament_lint_auto REQUIRED)
# Give cppcheck hints about macro definitions coming from outside this package
get_target_property(rclcpp_include_dirs rclcpp::rclcpp INTERFACE_INCLUDE_DIRECTORIES)
set(ament_cmake_cppcheck_ADDITIONAL_INCLUDE_DIRS ${rclcpp_include_dirs})
list(APPEND AMENT_LINT_AUTO_EXCLUDE "ament_cmake_cppcheck")
ament_lint_auto_find_test_dependencies()

find_package(ament_cmake_cppcheck REQUIRED)
ament_cppcheck()
set_tests_properties(cppcheck PROPERTIES TIMEOUT 360)

find_package(performance_test_fixture REQUIRED)

add_performance_test(
Expand Down
Loading