diff --git a/vehicle_launch/CMakeLists.txt b/vehicle_launch/CMakeLists.txt index 331b62f49..d49a9be1b 100644 --- a/vehicle_launch/CMakeLists.txt +++ b/vehicle_launch/CMakeLists.txt @@ -1,15 +1,15 @@ -cmake_minimum_required(VERSION 2.8.3) +cmake_minimum_required(VERSION 3.5) project(vehicle_launch) add_compile_options(-std=c++14) -find_package(catkin REQUIRED) +find_package(ament_cmake_auto REQUIRED) +find_package(xacro REQUIRED) -catkin_package() +ament_auto_find_build_dependencies() -install(DIRECTORY +ament_auto_package(INSTALL_TO_SHARE launch config urdf - DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION} ) diff --git a/vehicle_launch/COLCON_IGNORE b/vehicle_launch/COLCON_IGNORE deleted file mode 100644 index e69de29bb..000000000 diff --git a/vehicle_launch/launch/vehicle.launch.xml b/vehicle_launch/launch/vehicle.launch.xml index b6191e70c..09d534a88 100644 --- a/vehicle_launch/launch/vehicle.launch.xml +++ b/vehicle_launch/launch/vehicle.launch.xml @@ -5,20 +5,22 @@ - + - - - - - + + + + + + + - - - - - + + + + + diff --git a/vehicle_launch/launch/vehicle_description.launch.xml b/vehicle_launch/launch/vehicle_description.launch.xml index 7a09cd6e1..d1ccd1f31 100644 --- a/vehicle_launch/launch/vehicle_description.launch.xml +++ b/vehicle_launch/launch/vehicle_description.launch.xml @@ -3,22 +3,14 @@ - + - - - - - - - - - - - - - + + + + + diff --git a/vehicle_launch/launch/vehicle_interface.launch.xml b/vehicle_launch/launch/vehicle_interface.launch.xml index 675ff7839..5eb4ba2d2 100644 --- a/vehicle_launch/launch/vehicle_interface.launch.xml +++ b/vehicle_launch/launch/vehicle_interface.launch.xml @@ -1,19 +1,22 @@ - - - + + + + + + - - - + + + - - + + diff --git a/vehicle_launch/package.xml b/vehicle_launch/package.xml index e20bbfeef..8509d9580 100644 --- a/vehicle_launch/package.xml +++ b/vehicle_launch/package.xml @@ -8,14 +8,17 @@ Apache2 - catkin + ament_cmake_auto + + xacro + camera_description imu_description livox_description velodyne_description robot_state_publisher - roscpp + ament_cmake