ROS2 Linting: vehicle_info_util (autowarefoundation#163)

kosuke55 · Dec 11, 2020 · fbbee08 · fbbee08
1 parent 38b9bdc
commit fbbee08
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/vehicle/util/vehicle_info_util/CMakeLists.txt b/vehicle/util/vehicle_info_util/CMakeLists.txt
@@ -4,6 +4,8 @@ project(vehicle_info_util)
 ### Compile options
 if(NOT CMAKE_CXX_STANDARD)
   set(CMAKE_CXX_STANDARD 14)
+  set(CMAKE_CXX_STANDARD_REQUIRED ON)
+  set(CMAKE_CXX_EXTENSIONS OFF)
 endif()
 if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
   add_compile_options(-Wno-unused-parameter -Wall -Wextra -Wpedantic)
@@ -17,4 +19,9 @@ ament_auto_add_library(vehicle_info SHARED
   src/vehicle_info.cpp
 )
 
+if(BUILD_TESTING)
+  find_package(ament_lint_auto REQUIRED)
+  ament_lint_auto_find_test_dependencies()
+endif()
+
 ament_auto_package()
diff --git a/vehicle/util/vehicle_info_util/include/vehicle_info_util/vehicle_info.hpp b/vehicle/util/vehicle_info_util/include/vehicle_info_util/vehicle_info.hpp
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef VEHICLE_INFO_UTIL_VEHICLE_INFO_CORE_HPP_
-#define VEHICLE_INFO_UTIL_VEHICLE_INFO_CORE_HPP_
+#ifndef VEHICLE_INFO_UTIL__VEHICLE_INFO_HPP_
+#define VEHICLE_INFO_UTIL__VEHICLE_INFO_HPP_
 
 #include "rclcpp/rclcpp.hpp"
 
@@ -76,4 +76,4 @@ class VehicleInfo
 
 }  // namespace vehicle_info_util
 
-#endif
+#endif  // VEHICLE_INFO_UTIL__VEHICLE_INFO_HPP_
diff --git a/vehicle/util/vehicle_info_util/package.xml b/vehicle/util/vehicle_info_util/package.xml
@@ -11,6 +11,10 @@
   <buildtool_depend>ament_cmake_auto</buildtool_depend>
 
   <depend>rclcpp</depend>
+
+  <test_depend>ament_lint_auto</test_depend>
+  <test_depend>ament_lint_common</test_depend>
+
   <export>
     <build_type>ament_cmake</build_type>
   </export>

diff --git a/vehicle/util/vehicle_info_util/src/vehicle_info.cpp b/vehicle/util/vehicle_info_util/src/vehicle_info.cpp
@@ -86,7 +86,6 @@ VehicleInfo VehicleInfo::create(rclcpp::Node & node)
       wheel_radius_m, wheel_width_m, wheel_base_m, wheel_tread_m, front_overhang_m, rear_overhang_m,
       left_overhang_m, right_overhang_m, vehicle_height_m);
   }
-
 }
 
 }  // namespace vehicle_info_util