diff --git a/common/scenario_simulator_exception/package.xml b/common/scenario_simulator_exception/package.xml index b87d7a70669..a215361c122 100644 --- a/common/scenario_simulator_exception/package.xml +++ b/common/scenario_simulator_exception/package.xml @@ -8,6 +8,7 @@ Apache License 2.0 ament_cmake + ament_cmake_auto ament_cmake_clang_format ament_cmake_copyright diff --git a/common/simple_junit/package.xml b/common/simple_junit/package.xml index 8875806d65b..96c2e022089 100644 --- a/common/simple_junit/package.xml +++ b/common/simple_junit/package.xml @@ -9,6 +9,7 @@ Apache License 2.0 ament_cmake + ament_cmake_auto pugixml-dev boost diff --git a/common/status_monitor/package.xml b/common/status_monitor/package.xml index 6e177b3fc06..ff057e120e0 100644 --- a/common/status_monitor/package.xml +++ b/common/status_monitor/package.xml @@ -6,9 +6,13 @@ none Tatsuya Yamasaki Apache License 2.0 + ament_cmake + ament_cmake_auto + boost nlohmann-json-dev + ament_cmake diff --git a/map/kashiwanoha_map/package.xml b/map/kashiwanoha_map/package.xml index 6d0430a6e0f..42d2fa7df7c 100644 --- a/map/kashiwanoha_map/package.xml +++ b/map/kashiwanoha_map/package.xml @@ -10,10 +10,8 @@ ament_cmake ament_lint_auto - ament_cmake_clang_format ament_cmake_copyright ament_cmake_lint_cmake - ament_cmake_pep257 ament_cmake_xmllint diff --git a/map/simple_cross_map/package.xml b/map/simple_cross_map/package.xml index ebcde323ce6..3b90989bc2f 100644 --- a/map/simple_cross_map/package.xml +++ b/map/simple_cross_map/package.xml @@ -10,10 +10,8 @@ ament_cmake ament_lint_auto - ament_cmake_clang_format ament_cmake_copyright ament_cmake_lint_cmake - ament_cmake_pep257 ament_cmake_xmllint diff --git a/mock/cpp_mock_scenarios/package.xml b/mock/cpp_mock_scenarios/package.xml index 70683810764..e7b87d22958 100644 --- a/mock/cpp_mock_scenarios/package.xml +++ b/mock/cpp_mock_scenarios/package.xml @@ -8,6 +8,7 @@ Apache License 2.0 ament_cmake + ament_cmake_auto ament_cmake_test diff --git a/openscenario/openscenario_experimental_catalog/package.xml b/openscenario/openscenario_experimental_catalog/package.xml index bc6c25b6b80..4cc95ed64d4 100644 --- a/openscenario/openscenario_experimental_catalog/package.xml +++ b/openscenario/openscenario_experimental_catalog/package.xml @@ -6,6 +6,7 @@ TIER IV experimental catalogs for OpenSCENARIO Tatsuya Yamasaki Apache License 2.0 + ament_cmake ament_cmake diff --git a/openscenario/openscenario_interpreter/package.xml b/openscenario/openscenario_interpreter/package.xml index cbe59298697..c54009483c4 100644 --- a/openscenario/openscenario_interpreter/package.xml +++ b/openscenario/openscenario_interpreter/package.xml @@ -8,6 +8,7 @@ Apache License 2.0 ament_cmake + ament_cmake_auto concealer geometry_msgs diff --git a/openscenario/openscenario_interpreter_example/package.xml b/openscenario/openscenario_interpreter_example/package.xml index 90da70ea7f3..f4aa1031f23 100644 --- a/openscenario/openscenario_interpreter_example/package.xml +++ b/openscenario/openscenario_interpreter_example/package.xml @@ -9,6 +9,7 @@ Apache License 2.0 ament_cmake + ament_cmake_auto autoware_system_msgs boost diff --git a/openscenario/openscenario_interpreter_msgs/package.xml b/openscenario/openscenario_interpreter_msgs/package.xml index 86ab45c8c71..9b8e3d6693c 100644 --- a/openscenario/openscenario_interpreter_msgs/package.xml +++ b/openscenario/openscenario_interpreter_msgs/package.xml @@ -1,5 +1,5 @@ - + openscenario_interpreter_msgs 16.5.11 @@ -7,6 +7,7 @@ Yamasaki Tatsuya Apache License 2.0 ament_cmake + ament_cmake_auto rosidl_default_generators builtin_interfaces rosidl_default_runtime diff --git a/openscenario/openscenario_preprocessor_msgs/package.xml b/openscenario/openscenario_preprocessor_msgs/package.xml index b64aeee26cd..2fac3cfc1da 100644 --- a/openscenario/openscenario_preprocessor_msgs/package.xml +++ b/openscenario/openscenario_preprocessor_msgs/package.xml @@ -1,12 +1,12 @@ - + openscenario_preprocessor_msgs 16.5.11 ROS message types for package openscenario_preprocessor Kotaro Yoshimoto Apache License 2.0 - ament_cmake + ament_cmake_auto rosidl_default_generators builtin_interfaces rosidl_default_runtime diff --git a/simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/detection_sensor/detection_sensor.hpp b/simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/detection_sensor/detection_sensor.hpp index dcd5897d9d3..6b0e8ff40e3 100644 --- a/simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/detection_sensor/detection_sensor.hpp +++ b/simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/detection_sensor/detection_sensor.hpp @@ -15,7 +15,7 @@ #ifndef SIMPLE_SENSOR_SIMULATOR__SENSOR_SIMULATION__DETECTION_SENSOR__DETECTION_SENSOR_HPP_ #define SIMPLE_SENSOR_SIMULATOR__SENSOR_SIMULATION__DETECTION_SENSOR__DETECTION_SENSOR_HPP_ -#include +#include #include #include diff --git a/simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/imu/imu_sensor.hpp b/simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/imu/imu_sensor.hpp index 2672a1e2987..7ba2be386d8 100644 --- a/simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/imu/imu_sensor.hpp +++ b/simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/imu/imu_sensor.hpp @@ -15,7 +15,7 @@ #ifndef SIMPLE_SENSOR_SIMULATOR__SENSOR_SIMULATION__IMU_SENSOR_HPP_ #define SIMPLE_SENSOR_SIMULATOR__SENSOR_SIMULATION__IMU_SENSOR_HPP_ -#include +#include #include #include diff --git a/simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/lidar/lidar_sensor.hpp b/simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/lidar/lidar_sensor.hpp index dcd79ec15e1..3d25bbc31db 100644 --- a/simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/lidar/lidar_sensor.hpp +++ b/simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/lidar/lidar_sensor.hpp @@ -15,7 +15,7 @@ #ifndef SIMPLE_SENSOR_SIMULATOR__SENSOR_SIMULATION__LIDAR__LIDAR_SENSOR_HPP_ #define SIMPLE_SENSOR_SIMULATOR__SENSOR_SIMULATION__LIDAR__LIDAR_SENSOR_HPP_ -#include +#include #include #include diff --git a/simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/occupancy_grid/occupancy_grid_sensor.hpp b/simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/occupancy_grid/occupancy_grid_sensor.hpp index a5f17dbd8aa..31b012265ce 100644 --- a/simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/occupancy_grid/occupancy_grid_sensor.hpp +++ b/simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/occupancy_grid/occupancy_grid_sensor.hpp @@ -15,7 +15,7 @@ #ifndef SIMPLE_SENSOR_SIMULATOR__SENSOR_SIMULATION__OCCUPANCY_GRID__OCCUPANCY_GRID_SENSOR_HPP_ #define SIMPLE_SENSOR_SIMULATOR__SENSOR_SIMULATION__OCCUPANCY_GRID__OCCUPANCY_GRID_SENSOR_HPP_ -#include +#include #include #include diff --git a/simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/primitives/box.hpp b/simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/primitives/box.hpp index cb4f53a2bb4..71ef884dc8a 100644 --- a/simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/primitives/box.hpp +++ b/simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/primitives/box.hpp @@ -15,7 +15,7 @@ #ifndef SIMPLE_SENSOR_SIMULATOR__SENSOR_SIMULATION__PRIMITIVES__BOX_HPP_ #define SIMPLE_SENSOR_SIMULATOR__SENSOR_SIMULATION__PRIMITIVES__BOX_HPP_ -#include +#include #include diff --git a/simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/sensor_simulation.hpp b/simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/sensor_simulation.hpp index 94ffaad6851..7b0efcf070a 100644 --- a/simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/sensor_simulation.hpp +++ b/simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/sensor_simulation.hpp @@ -15,7 +15,7 @@ #ifndef SIMPLE_SENSOR_SIMULATOR__SENSOR_SIMULATION__SENSOR_SIMULATION_HPP_ #define SIMPLE_SENSOR_SIMULATOR__SENSOR_SIMULATION__SENSOR_SIMULATION_HPP_ -#include +#include #include #include diff --git a/simulation/simple_sensor_simulator/package.xml b/simulation/simple_sensor_simulator/package.xml index 2a0281d1ee1..f4ac45993e1 100644 --- a/simulation/simple_sensor_simulator/package.xml +++ b/simulation/simple_sensor_simulator/package.xml @@ -1,4 +1,5 @@ + simple_sensor_simulator 16.5.11 diff --git a/simulation/simple_sensor_simulator/test/src/utils/helper_functions.hpp b/simulation/simple_sensor_simulator/test/src/utils/helper_functions.hpp index 39adaeee487..f02c84ec97c 100644 --- a/simulation/simple_sensor_simulator/test/src/utils/helper_functions.hpp +++ b/simulation/simple_sensor_simulator/test/src/utils/helper_functions.hpp @@ -15,7 +15,7 @@ #ifndef SIMPLE_SENSOR_SIMULATOR__TEST__UTILS__HELPER_FUNCTIONS_HPP_ #define SIMPLE_SENSOR_SIMULATOR__TEST__UTILS__HELPER_FUNCTIONS_HPP_ -#include +#include #include #include diff --git a/simulation/simulation_interface/CMakeLists.txt b/simulation/simulation_interface/CMakeLists.txt index 00f59161a4d..3873aeb0557 100644 --- a/simulation/simulation_interface/CMakeLists.txt +++ b/simulation/simulation_interface/CMakeLists.txt @@ -32,10 +32,23 @@ set(PROTO_FILES "proto/std_msgs.proto" "proto/traffic_simulator_msgs.proto" ) -protobuf_generate_cpp(PROTO_SRCS PROTO_HDRS ${PROTO_FILES}) +set(PROTO_OUTPUT_DIR ${CMAKE_BINARY_DIR}/proto/${PROJECT_NAME}) + +# Ensure the output directory exists +file(MAKE_DIRECTORY ${PROTO_OUTPUT_DIR}) + +protobuf_generate( + PROTOS ${PROTO_FILES} + APPEND_PATH + LANGUAGE cpp + OUT_VAR PROTO_SRCS + IMPORT_DIRS proto/ + PROTOC_OUT_DIR ${PROTO_OUTPUT_DIR} +) + include_directories( include - ${CMAKE_BINARY_DIR} + ${CMAKE_BINARY_DIR}/proto/ ) ament_auto_add_library(simulation_interface SHARED @@ -60,8 +73,8 @@ install(TARGETS simulation_interface INCLUDES DESTINATION include) install( - FILES ${PROTO_HDRS} - DESTINATION include + DIRECTORY ${CMAKE_BINARY_DIR}/proto/ + DESTINATION include/ ) install( diff --git a/simulation/simulation_interface/include/simulation_interface/conversions.hpp b/simulation/simulation_interface/include/simulation_interface/conversions.hpp index 65532e148b4..606318332da 100644 --- a/simulation/simulation_interface/include/simulation_interface/conversions.hpp +++ b/simulation/simulation_interface/include/simulation_interface/conversions.hpp @@ -15,12 +15,12 @@ #ifndef SIMULATION_INTERFACE__CONVERSIONS_HPP_ #define SIMULATION_INTERFACE__CONVERSIONS_HPP_ -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/simulation/simulation_interface/include/simulation_interface/zmq_multi_client.hpp b/simulation/simulation_interface/include/simulation_interface/zmq_multi_client.hpp index 72a78f7d456..f62206c55d0 100644 --- a/simulation/simulation_interface/include/simulation_interface/zmq_multi_client.hpp +++ b/simulation/simulation_interface/include/simulation_interface/zmq_multi_client.hpp @@ -15,7 +15,7 @@ #ifndef SIMULATION_INTERFACE__ZMQ_MULTI_CLIENT_HPP_ #define SIMULATION_INTERFACE__ZMQ_MULTI_CLIENT_HPP_ -#include +#include #include #include diff --git a/simulation/simulation_interface/include/simulation_interface/zmq_multi_server.hpp b/simulation/simulation_interface/include/simulation_interface/zmq_multi_server.hpp index dea00eb3818..0a20a323da1 100644 --- a/simulation/simulation_interface/include/simulation_interface/zmq_multi_server.hpp +++ b/simulation/simulation_interface/include/simulation_interface/zmq_multi_server.hpp @@ -15,7 +15,7 @@ #ifndef SIMULATION_INTERFACE__ZMQ_MULTI_SERVER_HPP_ #define SIMULATION_INTERFACE__ZMQ_MULTI_SERVER_HPP_ -#include +#include #include #include diff --git a/simulation/simulation_interface/test/expect_equal_macros.hpp b/simulation/simulation_interface/test/expect_equal_macros.hpp index f3862a9bb6b..e397eeb03a9 100644 --- a/simulation/simulation_interface/test/expect_equal_macros.hpp +++ b/simulation/simulation_interface/test/expect_equal_macros.hpp @@ -15,8 +15,8 @@ #ifndef SIMULATION_INTERFACE__TEST__EXPECT_EQUAL_MACROS_HPP_ #define SIMULATION_INTERFACE__TEST__EXPECT_EQUAL_MACROS_HPP_ -#include #include +#include #include #include diff --git a/simulation/simulation_interface/test/test_conversions.cpp b/simulation/simulation_interface/test/test_conversions.cpp index 833baa4fd6d..ba70195ced9 100644 --- a/simulation/simulation_interface/test/test_conversions.cpp +++ b/simulation/simulation_interface/test/test_conversions.cpp @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include #include +#include #include "expect_equal_macros.hpp" /** diff --git a/simulation/traffic_simulator/include/traffic_simulator/api/api.hpp b/simulation/traffic_simulator/include/traffic_simulator/api/api.hpp index 1c0a6cc5ed5..026263cc783 100644 --- a/simulation/traffic_simulator/include/traffic_simulator/api/api.hpp +++ b/simulation/traffic_simulator/include/traffic_simulator/api/api.hpp @@ -15,7 +15,7 @@ #ifndef TRAFFIC_SIMULATOR__API__API_HPP_ #define TRAFFIC_SIMULATOR__API__API_HPP_ -#include +#include #include #include diff --git a/simulation/traffic_simulator/include/traffic_simulator/helper/helper.hpp b/simulation/traffic_simulator/include/traffic_simulator/helper/helper.hpp index dec9b5ab2aa..fd89c02d7ab 100644 --- a/simulation/traffic_simulator/include/traffic_simulator/helper/helper.hpp +++ b/simulation/traffic_simulator/include/traffic_simulator/helper/helper.hpp @@ -15,7 +15,7 @@ #ifndef TRAFFIC_SIMULATOR__HELPER__HELPER_HPP_ #define TRAFFIC_SIMULATOR__HELPER__HELPER_HPP_ -#include +#include #include #include diff --git a/simulation/traffic_simulator/include/traffic_simulator/traffic_lights/traffic_light.hpp b/simulation/traffic_simulator/include/traffic_simulator/traffic_lights/traffic_light.hpp index 734683a3828..646259da070 100644 --- a/simulation/traffic_simulator/include/traffic_simulator/traffic_lights/traffic_light.hpp +++ b/simulation/traffic_simulator/include/traffic_simulator/traffic_lights/traffic_light.hpp @@ -15,7 +15,7 @@ #ifndef TRAFFIC_SIMULATOR__TRAFFIC_LIGHTS__TRAFFIC_LIGHT_HPP_ #define TRAFFIC_SIMULATOR__TRAFFIC_LIGHTS__TRAFFIC_LIGHT_HPP_ -#include +#include #include #include diff --git a/simulation/traffic_simulator/include/traffic_simulator/traffic_lights/traffic_lights_base.hpp b/simulation/traffic_simulator/include/traffic_simulator/traffic_lights/traffic_lights_base.hpp index f488dcdd30c..9db1e706566 100644 --- a/simulation/traffic_simulator/include/traffic_simulator/traffic_lights/traffic_lights_base.hpp +++ b/simulation/traffic_simulator/include/traffic_simulator/traffic_lights/traffic_lights_base.hpp @@ -15,7 +15,7 @@ #ifndef TRAFFIC_SIMULATOR__TRAFFIC_LIGHTS__TRAFFIC_LIGHTS_BASE_HPP_ #define TRAFFIC_SIMULATOR__TRAFFIC_LIGHTS__TRAFFIC_LIGHTS_BASE_HPP_ -#include +#include #include #include diff --git a/simulation/traffic_simulator/package.xml b/simulation/traffic_simulator/package.xml index 5afc4735aa6..e8afcf58874 100644 --- a/simulation/traffic_simulator/package.xml +++ b/simulation/traffic_simulator/package.xml @@ -1,4 +1,5 @@ + traffic_simulator 16.5.11 diff --git a/test_runner/random_test_runner/package.xml b/test_runner/random_test_runner/package.xml index 3abe972b858..1183347ef05 100644 --- a/test_runner/random_test_runner/package.xml +++ b/test_runner/random_test_runner/package.xml @@ -8,6 +8,7 @@ Apache License 2.0 ament_cmake + ament_cmake_auto traffic_simulator simple_sensor_simulator