feat(control): use autoware cmake to avoid Boost warning (autowarefou…

…ndation#530)
YamatoAndo · May 26, 2023 · 12ee83b · 12ee83b
1 parent 9d8a1bc
commit 12ee83b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 20 deletions.
diff --git a/control/lane_departure_checker/CMakeLists.txt b/control/lane_departure_checker/CMakeLists.txt
@@ -1,28 +1,15 @@
 cmake_minimum_required(VERSION 3.5)
 project(lane_departure_checker)
 
-find_package(ament_cmake_auto REQUIRED)
-ament_auto_find_build_dependencies()
-
-### 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(-Wall -Wextra -Wpedantic -Werror)
-endif()
-
+find_package(autoware_cmake REQUIRED)
+autoware_package()
 
 include_directories(
   include
   ${Boost_INCLUDE_DIRS}
   ${EIGEN3_INCLUDE_DIRS}
 )
 
-# Target
-## lane_departure_checker_node
 ament_auto_add_library(lane_departure_checker SHARED
   src/lane_departure_checker_node/lane_departure_checker.cpp
   src/lane_departure_checker_node/lane_departure_checker_node.cpp
@@ -33,11 +20,6 @@ rclcpp_components_register_node(lane_departure_checker
   EXECUTABLE lane_departure_checker_node
 )
 
-if(BUILD_TESTING)
-  find_package(ament_lint_auto REQUIRED)
-  ament_lint_auto_find_test_dependencies()
-endif()
-
 ament_auto_package(
   INSTALL_TO_SHARE
     launch

diff --git a/control/lane_departure_checker/package.xml b/control/lane_departure_checker/package.xml
@@ -7,6 +7,7 @@
   <license>Apache License 2.0</license>
 
   <buildtool_depend>ament_cmake_auto</buildtool_depend>
+  <build_depend>autoware_cmake</build_depend>
 
   <depend>autoware_auto_mapping_msgs</depend>
   <depend>autoware_auto_planning_msgs</depend>