use autoware_cmake in CMakeLists.txt

Signed-off-by: Kenji Miyake <kenji.miyake@tier4.jp>
autowarefoundation · May 4, 2022 · 7e9be70 · 7e9be70
1 parent da1bbc9
commit 7e9be70
Show file tree

Hide file tree

Showing 132 changed files with 277 additions and 2,124 deletions.
diff --git a/common/autoware_ad_api_msgs/CMakeLists.txt b/common/autoware_ad_api_msgs/CMakeLists.txt
@@ -1,8 +1,8 @@
 cmake_minimum_required(VERSION 3.5)
 project(autoware_ad_api_msgs)
 
-find_package(ament_cmake_auto REQUIRED)
-ament_auto_find_build_dependencies()
+find_package(autoware_cmake REQUIRED)
+autoware_package()
 
 rosidl_generate_interfaces(${PROJECT_NAME}
   srv/InterfaceVersion.srv
@@ -12,9 +12,4 @@ rosidl_generate_interfaces(${PROJECT_NAME}
     geometry_msgs
 )
 
-if(BUILD_TESTING)
-  find_package(ament_lint_auto REQUIRED)
-  ament_lint_auto_find_test_dependencies()
-endif()
-
 ament_auto_package()
diff --git a/common/autoware_auto_common/CMakeLists.txt b/common/autoware_auto_common/CMakeLists.txt
@@ -19,33 +19,13 @@ cmake_minimum_required(VERSION 3.5)
 ### Export headers
 project(autoware_auto_common)
 
-## dependencies
-find_package(ament_cmake_auto REQUIRED)
-find_package(Eigen3 REQUIRED)
-ament_auto_find_build_dependencies()
+find_package(autoware_cmake REQUIRED)
+autoware_package()
 
+find_package(Eigen3 REQUIRED)
 include_directories(SYSTEM ${EIGEN3_INCLUDE_DIR})
 
 if(BUILD_TESTING)
-  find_package(ament_lint_auto REQUIRED)
-
-  # Temporarily disable cpplint and uncrustify
-  list(APPEND AMENT_LINT_AUTO_EXCLUDE
-    ament_cmake_cpplint
-  )
-
-  ament_lint_auto_find_test_dependencies()
-
-  file(GLOB_RECURSE FILES_MINUS_SOME
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/*
-    ${CMAKE_CURRENT_SOURCE_DIR}/test/*
-  )
-
-  # Re-enable cpplint
-  find_package(ament_cmake_cpplint)
-  ament_cpplint(${FILES_MINUS_SOME})
-
-  # Unit tests
   set(TEST_COMMON test_common_gtest)
   ament_add_gtest(${TEST_COMMON}
     test/gtest_main.cpp
@@ -68,5 +48,4 @@ if(BUILD_TESTING)
   )
 endif()
 
-# Ament Exporting
 ament_auto_package()
diff --git a/common/autoware_auto_geometry/CMakeLists.txt b/common/autoware_auto_geometry/CMakeLists.txt
@@ -18,11 +18,9 @@ cmake_minimum_required(VERSION 3.5)
 ### Export headers
 project(autoware_auto_geometry)
 
-## dependencies
-find_package(ament_cmake_auto REQUIRED)
-ament_auto_find_build_dependencies()
+find_package(autoware_cmake REQUIRED)
+autoware_package()
 
-# includes
 ament_auto_add_library(${PROJECT_NAME} SHARED
   include/geometry/spatial_hash.hpp
   include/geometry/intersection.hpp
@@ -38,10 +36,6 @@ if(${tf2_geometry_msgs_VERSION} VERSION_LESS 0.18.0)
 endif()
 
 if(BUILD_TESTING)
-  # run linters
-  find_package(ament_lint_auto REQUIRED)
-  ament_lint_auto_find_test_dependencies()
-  # gtest
   set(GEOMETRY_GTEST geometry_gtest)
   set(GEOMETRY_SRC test/src/test_geometry.cpp
     test/src/test_convex_hull.cpp
@@ -65,5 +59,4 @@ if(BUILD_TESTING)
   target_link_libraries(${GEOMETRY_GTEST} ${PROJECT_NAME})
 endif()
 
-# Ament Exporting
 ament_auto_package()
diff --git a/common/autoware_auto_perception_rviz_plugin/CMakeLists.txt b/common/autoware_auto_perception_rviz_plugin/CMakeLists.txt
@@ -17,10 +17,8 @@
 cmake_minimum_required(VERSION 3.5)
 project(autoware_auto_perception_rviz_plugin)
 
-#dependencies
-find_package(ament_cmake_auto REQUIRED)
-find_package(Qt5 REQUIRED COMPONENTS Widgets)
-ament_auto_find_build_dependencies()
+find_package(autoware_cmake REQUIRED)
+autoware_package()
 
 set(OD_PLUGIN_LIB_SRC
   src/object_detection/detected_objects_display.cpp
@@ -72,12 +70,6 @@ target_compile_definitions(${PROJECT_NAME} PRIVATE "OBJECT_DETECTION_PLUGINS_BUI
 # Export the plugin to be imported by rviz2
 pluginlib_export_plugin_description_file(rviz_common plugins_description.xml)
 
-if(BUILD_TESTING)
-  # run linters
-  find_package(ament_lint_auto REQUIRED)
-  ament_lint_auto_find_test_dependencies()
-endif()
-
 ament_auto_package(
   INSTALL_TO_SHARE
   icons

diff --git a/common/autoware_auto_tf2/CMakeLists.txt b/common/autoware_auto_tf2/CMakeLists.txt
@@ -16,18 +16,10 @@ cmake_minimum_required(VERSION 3.5)
 ### Export headers
 project(autoware_auto_tf2)
 
-## dependencies
-find_package(ament_cmake REQUIRED)
-find_package(ament_cmake_auto REQUIRED)
-ament_auto_find_build_dependencies()
+find_package(autoware_cmake REQUIRED)
+autoware_package()
 
-
-### Test
 if(BUILD_TESTING)
-  find_package(ament_lint_auto REQUIRED)
-  # Linters
-  ament_lint_auto_find_test_dependencies()
-  # Unit test
   ament_add_gtest(test_tf2_autoware_auto_msgs test/test_tf2_autoware_auto_msgs.cpp)
   # workaround to allow deprecated header to build on both galactic and rolling
   if(${tf2_geometry_msgs_VERSION} VERSION_LESS 0.18.0)

diff --git a/common/autoware_point_types/CMakeLists.txt b/common/autoware_point_types/CMakeLists.txt
@@ -1,18 +1,8 @@
 cmake_minimum_required(VERSION 3.5)
 project(autoware_point_types)
 
-if(NOT CMAKE_CXX_STANDARD)
-  set(CMAKE_CXX_STANDARD 17)
-  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(ament_cmake_auto REQUIRED)
-ament_auto_find_build_dependencies()
+find_package(autoware_cmake REQUIRED)
+autoware_package()
 
 include_directories(
   include
@@ -21,11 +11,6 @@ include_directories(
 )
 
 if(BUILD_TESTING)
-  find_package(ament_lint_auto REQUIRED)
-  ament_lint_auto_find_test_dependencies()
-
-  find_package(ament_cmake_gtest REQUIRED)
-
   ament_add_gtest(test_autoware_point_types
     test/test_point_types.cpp
   )

diff --git a/common/autoware_testing/CMakeLists.txt b/common/autoware_testing/CMakeLists.txt
@@ -13,21 +13,15 @@
 # limitations under the License.
 
 cmake_minimum_required(VERSION 3.5)
-
 project(autoware_testing)
 
-find_package(ament_cmake_auto REQUIRED)
-ament_auto_find_build_dependencies()
-
+find_package(autoware_cmake REQUIRED)
+autoware_package()
 
 list(APPEND ${PROJECT_NAME}_CONFIG_EXTRAS
   "autoware_testing-extras.cmake"
 )
 
-if(BUILD_TESTING)
-    ament_lint_cmake(${CMAKE_CURRENT_SOURCE_DIR})
-endif()
-
 ament_auto_package(
   INSTALL_TO_SHARE cmake autoware_testing
 )
diff --git a/common/component_interface_utils/CMakeLists.txt b/common/component_interface_utils/CMakeLists.txt
@@ -1,22 +1,7 @@
 cmake_minimum_required(VERSION 3.8)
 project(component_interface_utils)
 
-if(NOT CMAKE_CXX_STANDARD)
-  set(CMAKE_CXX_STANDARD 17)
-  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(ament_cmake_auto REQUIRED)
-ament_auto_find_build_dependencies()
-
-if(BUILD_TESTING)
-  find_package(ament_lint_auto REQUIRED)
-  ament_lint_auto_find_test_dependencies()
-endif()
+find_package(autoware_cmake REQUIRED)
+autoware_package()
 
 ament_auto_package()
diff --git a/common/fake_test_node/CMakeLists.txt b/common/fake_test_node/CMakeLists.txt
@@ -17,18 +17,12 @@
 cmake_minimum_required(VERSION 3.5)
 project(fake_test_node)
 
-find_package(ament_cmake_auto REQUIRED)
-
-ament_auto_find_build_dependencies()
+find_package(autoware_cmake REQUIRED)
+autoware_package()
 
 ament_auto_add_library(fake_test_node SHARED src/fake_test_node.cpp)
 
-## Testing
 if(BUILD_TESTING)
-  find_package(ament_lint_auto REQUIRED)
-  ament_lint_auto_find_test_dependencies()
-
-  find_package(ament_cmake_gtest REQUIRED)
   ament_add_gtest(test_fake_test_node
     test/test_fake_test_node.cpp
   )

diff --git a/common/global_parameter_loader/CMakeLists.txt b/common/global_parameter_loader/CMakeLists.txt
@@ -1,13 +1,8 @@
 cmake_minimum_required(VERSION 3.5)
 project(global_parameter_loader)
 
-find_package(ament_cmake_auto REQUIRED)
-ament_auto_find_build_dependencies()
-
-if(BUILD_TESTING)
-  find_package(ament_lint_auto REQUIRED)
-  ament_lint_auto_find_test_dependencies()
-endif()
+find_package(autoware_cmake REQUIRED)
+autoware_package()
 
 ament_auto_package(
   INSTALL_TO_SHARE

diff --git a/common/goal_distance_calculator/CMakeLists.txt b/common/goal_distance_calculator/CMakeLists.txt
@@ -1,14 +1,8 @@
 cmake_minimum_required(VERSION 3.5)
 project(goal_distance_calculator)
 
-find_package(ament_cmake_auto REQUIRED)
-ament_auto_find_build_dependencies()
-
-if(NOT CMAKE_CXX_STANDARD)
-  set(CMAKE_CXX_STANDARD 14)
-  set(CMAKE_CXX_STANDARD_REQUIRED ON)
-  set(CMAKE_CXX_EXTENSIONS OFF)
-endif()
+find_package(autoware_cmake REQUIRED)
+autoware_package()
 
 ament_auto_add_library(goal_distance_calculator SHARED
   src/goal_distance_calculator_node.cpp
@@ -27,11 +21,6 @@ rclcpp_components_register_node(goal_distance_calculator
   EXECUTABLE goal_distance_calculator_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/common/had_map_utils/CMakeLists.txt b/common/had_map_utils/CMakeLists.txt
@@ -5,18 +5,11 @@ cmake_minimum_required(VERSION 3.5)
 ### Export headers
 project(had_map_utils)
 
-if(NOT CMAKE_CXX_STANDARD)
-  set(CMAKE_CXX_STANDARD 14)
-endif()
+find_package(autoware_cmake REQUIRED)
+autoware_package()
 
-if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-  add_compile_options(-Wall -Wextra -Wpedantic -Werror)
-endif()
-
-find_package(ament_cmake_auto REQUIRED)
 find_package(CGAL REQUIRED COMPONENTS Core)
 find_package(Eigen3 REQUIRED)
-ament_auto_find_build_dependencies()
 
 ament_auto_add_library(${PROJECT_NAME} SHARED
   src/had_map_utils.cpp
@@ -38,9 +31,4 @@ target_include_directories(${PROJECT_NAME} SYSTEM PUBLIC
 set(CGAL_DO_NOT_WARN_ABOUT_CMAKE_BUILD_TYPE TRUE)
 target_link_libraries(${PROJECT_NAME} CGAL CGAL::CGAL CGAL::CGAL_Core)
 
-# if(BUILD_TESTING)
-#   find_package(ament_lint_auto REQUIRED)
-#   ament_lint_auto_find_test_dependencies()
-# endif()
-
 ament_auto_package()
diff --git a/common/interpolation/CMakeLists.txt b/common/interpolation/CMakeLists.txt
@@ -1,16 +1,8 @@
 cmake_minimum_required(VERSION 3.5)
 project(interpolation)
 
-### Compile options
-if(NOT CMAKE_CXX_STANDARD)
-  set(CMAKE_CXX_STANDARD 17)
-endif()
-if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-  add_compile_options(-Wall -Wextra -Wpedantic -Werror)
-endif()
-
-find_package(ament_cmake_auto REQUIRED)
-ament_auto_find_build_dependencies()
+find_package(autoware_cmake REQUIRED)
+autoware_package()
 
 ament_auto_add_library(interpolation SHARED
   src/linear_interpolation.cpp
@@ -25,13 +17,7 @@ if(${tf2_geometry_msgs_VERSION} VERSION_LESS 0.18.0)
   )
 endif()
 
-# Test
 if(BUILD_TESTING)
-  find_package(ament_lint_auto REQUIRED)
-  ament_lint_auto_find_test_dependencies()
-
-  find_package(ament_cmake_gtest REQUIRED)
-
   file(GLOB_RECURSE test_files test/**/*.cpp)
 
   ament_add_gtest(test_interpolation ${test_files})

diff --git a/common/interpolation/package.xml b/common/interpolation/package.xml
@@ -14,6 +14,7 @@
 
   <depend>tier4_autoware_utils</depend>
 
+  <test_depend>ament_cmake_gtest</test_depend>
   <test_depend>ament_lint_auto</test_depend>
   <test_depend>autoware_lint_common</test_depend>
 

diff --git a/common/kalman_filter/CMakeLists.txt b/common/kalman_filter/CMakeLists.txt
@@ -1,17 +1,8 @@
 cmake_minimum_required(VERSION 3.5)
 project(kalman_filter)
 
-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)
-endif()
-
-find_package(ament_cmake_auto REQUIRED)
-ament_auto_find_build_dependencies()
+find_package(autoware_cmake REQUIRED)
+autoware_package()
 
 find_package(eigen3_cmake_module REQUIRED)
 find_package(Eigen3 REQUIRED)
@@ -23,9 +14,4 @@ ament_auto_add_library(kalman_filter SHARED
   include/kalman_filter/time_delay_kalman_filter.hpp
 )
 
-if(BUILD_TESTING)
-  find_package(ament_lint_auto REQUIRED)
-  ament_lint_auto_find_test_dependencies()
-endif()
-
 ament_auto_package()