Bringing new packages up to standard.

ros-navigation · Sep 7, 2018 · 2c0b5f2 · 2c0b5f2
1 parent dda8368
commit 2c0b5f2
Show file tree

Hide file tree

Showing 13 changed files with 27 additions and 101 deletions.
diff --git a/src/libs/nav2_libs_msgs/CMakeLists.txt b/src/libs/nav2_libs_msgs/CMakeLists.txt
@@ -22,20 +22,6 @@ rosidl_generate_interfaces(${PROJECT_NAME}
   DEPENDENCIES builtin_interfaces geometry_msgs std_msgs
 )
 
-if(BUILD_TESTING)
-  find_package(ament_cmake_cppcheck REQUIRED)
-  find_package(ament_cmake_cpplint REQUIRED)
-  find_package(ament_cmake_lint_cmake REQUIRED)
-  find_package(ament_cmake_uncrustify REQUIRED)
-  # This forces cppcheck to consider all files in this project to be C++,
-  # including the headers which end with .h, which cppcheck would normally
-  # consider to be C instead.
-  ament_cppcheck(LANGUAGE "c++")
-  ament_cpplint()
-  ament_lint_cmake()
-  ament_uncrustify()
-endif()
-
 ament_export_dependencies(rosidl_default_runtime)
 
 ament_package()
diff --git a/src/libs/nav2_tasks/CMakeLists.txt b/src/libs/nav2_tasks/CMakeLists.txt
@@ -31,17 +31,8 @@ rosidl_generate_interfaces(nav2_tasks
 )
 
 if(BUILD_TESTING)
-  find_package(ament_cmake_cppcheck REQUIRED)
-  find_package(ament_cmake_cpplint REQUIRED)
-  find_package(ament_cmake_lint_cmake REQUIRED)
-  find_package(ament_cmake_uncrustify REQUIRED)
-  # This forces cppcheck to consider all files in this project to be C++,
-  # including the headers which end with .h, which cppcheck would normally
-  # consider to be C instead.
-  ament_cppcheck(LANGUAGE "c++")
-  ament_cpplint()
-  ament_lint_cmake()
-  ament_uncrustify()
+  find_package(ament_lint_auto REQUIRED)
+  ament_lint_auto_find_test_dependencies()
 endif()
 
 ament_export_include_directories(include)

diff --git a/src/libs/nav2_util/CMakeLists.txt b/src/libs/nav2_util/CMakeLists.txt
@@ -62,17 +62,8 @@ install(DIRECTORY include/
 )
 
 if(BUILD_TESTING)
-  find_package(ament_cmake_cppcheck REQUIRED)
-  find_package(ament_cmake_cpplint REQUIRED)
-  find_package(ament_cmake_lint_cmake REQUIRED)
-  find_package(ament_cmake_uncrustify REQUIRED)
-  # This forces cppcheck to consider all files in this project to be C++,
-  # including the headers which end with .h, which cppcheck would normally
-  # consider to be C instead.
-  ament_cppcheck(LANGUAGE "c++")
-  ament_cpplint()
-  ament_lint_cmake()
-  ament_uncrustify()
+  find_package(ament_lint_auto REQUIRED)
+  ament_lint_auto_find_test_dependencies()
 endif()
 
 ament_export_include_directories(include)

diff --git a/src/libs/nav2_util/package.xml b/src/libs/nav2_util/package.xml
@@ -15,6 +15,9 @@
   <exec_depend>rclcpp</exec_depend>
   <exec_depend>nav2_libs_msgs</exec_depend>
 
+  <test_depend>ament_lint_common</test_depend>
+  <test_depend>ament_lint_auto</test_depend>
+
   <export>
     <build_type>ament_cmake</build_type>
   </export>

diff --git a/src/localization/nav2_amcl/CMakeLists.txt b/src/localization/nav2_amcl/CMakeLists.txt
@@ -23,7 +23,7 @@ find_package(tf2 REQUIRED)
 find_package(nav2_util REQUIRED)
 
 include_directories(
-  include 
+  include
   ${Boost_INCLUDE_DIRS}
   )
 
@@ -71,6 +71,11 @@ install(TARGETS ${executable_name} ${library_name}
   RUNTIME DESTINATION bin
   )
 
+if(BUILD_TESTING)
+  find_package(ament_lint_auto REQUIRED)
+  ament_lint_auto_find_test_dependencies()
+endif()
+
 ament_export_include_directories(include)
 
 ament_package()
diff --git a/src/localization/nav2_amcl/package.xml b/src/localization/nav2_amcl/package.xml
@@ -34,6 +34,10 @@
   <build_depend>tf2_ros</build_depend>
   <build_depend>tf2</build_depend>
   <build_depend>nav2_util</build_depend>
+
+  <test_depend>ament_lint_common</test_depend>
+  <test_depend>ament_lint_auto</test_depend>
+
   <export>
     <build_type>ament_cmake</build_type>
   </export>

diff --git a/src/mission_execution/nav2_mission_execution_msgs/CMakeLists.txt b/src/mission_execution/nav2_mission_execution_msgs/CMakeLists.txt
@@ -21,20 +21,6 @@ rosidl_generate_interfaces(${PROJECT_NAME}
   DEPENDENCIES builtin_interfaces geometry_msgs std_msgs
 )
 
-if(BUILD_TESTING)
-  find_package(ament_cmake_cppcheck REQUIRED)
-  find_package(ament_cmake_cpplint REQUIRED)
-  find_package(ament_cmake_lint_cmake REQUIRED)
-  find_package(ament_cmake_uncrustify REQUIRED)
-  # This forces cppcheck to consider all files in this project to be C++,
-  # including the headers which end with .h, which cppcheck would normally
-  # consider to be C instead.
-  ament_cppcheck(LANGUAGE "c++")
-  ament_cpplint()
-  ament_lint_cmake()
-  ament_uncrustify()
-endif()
-
 ament_export_dependencies(rosidl_default_runtime)
 
 ament_package()
diff --git a/src/navigation/nav2_bt_navigator/CMakeLists.txt b/src/navigation/nav2_bt_navigator/CMakeLists.txt
@@ -59,17 +59,8 @@ install(DIRECTORY include/
 )
 
 if(BUILD_TESTING)
-  find_package(ament_cmake_cppcheck REQUIRED)
-  find_package(ament_cmake_cpplint REQUIRED)
-  find_package(ament_cmake_lint_cmake REQUIRED)
-  find_package(ament_cmake_uncrustify REQUIRED)
-  # This forces cppcheck to consider all files in this project to be C++,
-  # including the headers which end with .h, which cppcheck would normally
-  # consider to be C instead.
-  ament_cppcheck(LANGUAGE "c++")
-  ament_cpplint()
-  ament_lint_cmake()
-  ament_uncrustify()
+  find_package(ament_lint_auto REQUIRED)
+  ament_lint_auto_find_test_dependencies()
 endif()
 
 ament_export_include_directories(include)

diff --git a/src/planning/nav2_dijkstra_planner/CMakeLists.txt b/src/planning/nav2_dijkstra_planner/CMakeLists.txt
@@ -67,17 +67,8 @@ install(DIRECTORY include/
 )
 
 if(BUILD_TESTING)
-  find_package(ament_cmake_cppcheck REQUIRED)
-  find_package(ament_cmake_cpplint REQUIRED)
-  find_package(ament_cmake_lint_cmake REQUIRED)
-  find_package(ament_cmake_uncrustify REQUIRED)
-  # This forces cppcheck to consider all files in this project to be C++,
-  # including the headers which end with .h, which cppcheck would normally
-  # consider to be C instead.
-  ament_cppcheck(LANGUAGE "c++")
-  ament_cpplint()
-  ament_lint_cmake()
-  ament_uncrustify()
+  find_package(ament_lint_auto REQUIRED)
+  ament_lint_auto_find_test_dependencies()
 endif()
 
 ament_export_include_directories(include)

diff --git a/src/planning/nav2_dijkstra_planner/package.xml b/src/planning/nav2_dijkstra_planner/package.xml
@@ -22,6 +22,9 @@
   <exec_depend>nav2_util_msgs</exec_depend>
   <exec_depend>nav2_world_model_msgs</exec_depend>
 
+  <test_depend>ament_lint_common</test_depend>
+  <test_depend>ament_lint_auto</test_depend>
+
   <export>
     <build_type>ament_cmake</build_type>
   </export>

diff --git a/src/planning/nav2_planning_msgs/CMakeLists.txt b/src/planning/nav2_planning_msgs/CMakeLists.txt
@@ -22,20 +22,6 @@ rosidl_generate_interfaces(${PROJECT_NAME}
   DEPENDENCIES builtin_interfaces geometry_msgs std_msgs
 )
 
-if(BUILD_TESTING)
-  find_package(ament_cmake_cppcheck REQUIRED)
-  find_package(ament_cmake_cpplint REQUIRED)
-  find_package(ament_cmake_lint_cmake REQUIRED)
-  find_package(ament_cmake_uncrustify REQUIRED)
-  # This forces cppcheck to consider all files in this project to be C++,
-  # including the headers which end with .h, which cppcheck would normally
-  # consider to be C instead.
-  ament_cppcheck(LANGUAGE "c++")
-  ament_cpplint()
-  ament_lint_cmake()
-  ament_uncrustify()
-endif()
-
 ament_export_dependencies(rosidl_default_runtime)
 
 ament_package()
diff --git a/src/world_model/nav2_costmap_world_model/package.xml b/src/world_model/nav2_costmap_world_model/package.xml
@@ -20,6 +20,9 @@
   <exec_depend>nav2_util_msgs</exec_depend>
   <exec_depend>nav2_world_model_msgs</exec_depend>
 
+  <test_depend>ament_lint_common</test_depend>
+  <test_depend>ament_lint_auto</test_depend>
+
   <export>
     <build_type>ament_cmake</build_type>
   </export>

diff --git a/src/world_model/nav2_world_model_msgs/CMakeLists.txt b/src/world_model/nav2_world_model_msgs/CMakeLists.txt
@@ -22,20 +22,6 @@ rosidl_generate_interfaces(${PROJECT_NAME}
   DEPENDENCIES builtin_interfaces geometry_msgs std_msgs nav2_libs_msgs
 )
 
-if(BUILD_TESTING)
-  find_package(ament_cmake_cppcheck REQUIRED)
-  find_package(ament_cmake_cpplint REQUIRED)
-  find_package(ament_cmake_lint_cmake REQUIRED)
-  find_package(ament_cmake_uncrustify REQUIRED)
-  # This forces cppcheck to consider all files in this project to be C++,
-  # including the headers which end with .h, which cppcheck would normally
-  # consider to be C instead.
-  ament_cppcheck(LANGUAGE "c++")
-  ament_cpplint()
-  ament_lint_cmake()
-  ament_uncrustify()
-endif()
-
 ament_export_dependencies(rosidl_default_runtime)
 
 ament_package()