Skip to content

Migrate dave_sensor_models from catkin to ament_cmake for ROS 2 #305

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vinaya-53 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Migrate dave_sensor_models from catkin to ament_cmake for ROS 2 #305

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 7 additions & 13 deletions models/dave_robot_models/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,14 @@
cmake_minimum_required(VERSION 3.0.2)
cmake_minimum_required(VERSION 3.8)
project(dave_robot_models)

if(NOT "${CMAKE_VERSION}" VERSION_LESS "3.16")
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
else()
add_compile_options(-std=c++11)
if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
add_compile_options(-Wall -Wextra -Wpedantic)
endif()

find_package(catkin REQUIRED COMPONENTS
gazebo_plugins
uuv_sensor_ros_plugins
ds_sim)

catkin_package()
find_package(ament_cmake REQUIRED)

install(DIRECTORY models
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
DESTINATION share/${PROJECT_NAME}
PATTERN "*~" EXCLUDE)

ament_package()
12 changes: 7 additions & 5 deletions models/dave_robot_models/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,19 @@
<?xml version="1.0"?>
<package format="2">
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>dave_robot_models</name>
<version>3.1.1</version>
<description>The dave_robot_models package</description>
<author email="woensug.choi.ks@nps.edu">Woensug Choi</author>
<maintainer email="dtdavi1@nps.edu">dtdavis</maintainer>
<license>Apache 2.0</license>

<buildtool_depend>catkin</buildtool_depend>
<buildtool_depend>ament_cmake</buildtool_depend>

<exec_depend>gazebo_ros</exec_depend>
<exec_depend>uuv_sensor_ros_plugins</exec_depend>
<exec_depend>ds_sim</exec_depend>

<depend>gazebo_ros</depend>
<depend>uuv_sensor_ros_plugins</depend>
<depend>ds_sim</depend>
<export>
<gazebo_ros gazebo_model_path="${prefix}/models"/>
<gazebo_ros gazebo_media_path="${prefix}"/>
Expand Down
20 changes: 7 additions & 13 deletions models/dave_sensor_models/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,14 @@
cmake_minimum_required(VERSION 3.0.2)
cmake_minimum_required(VERSION 3.8)
project(dave_sensor_models)

if(NOT "${CMAKE_VERSION}" VERSION_LESS "3.16")
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
else()
add_compile_options(-std=c++11)
if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
add_compile_options(-Wall -Wextra -Wpedantic)
endif()

find_package(catkin REQUIRED COMPONENTS
gazebo_plugins
uuv_sensor_ros_plugins
ds_sim)

catkin_package()
find_package(ament_cmake REQUIRED)

install(DIRECTORY models
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
DESTINATION share/${PROJECT_NAME}
PATTERN "*~" EXCLUDE)

ament_package()
12 changes: 7 additions & 5 deletions models/dave_sensor_models/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,19 @@
<?xml version="1.0"?>
<package format="2">
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>dave_sensor_models</name>
<version>3.1.1</version>
<description>The dave_sensor_models package</description>
<author email="dtdavi1@nps.edu">Duane Davis</author>
<maintainer email="dtdavi1@nps.edu">dtdavis</maintainer>
<license>Apache 2.0</license>

<buildtool_depend>catkin</buildtool_depend>
<buildtool_depend>ament_cmake</buildtool_depend>

<exec_depend>gazebo_ros</exec_depend>
<exec_depend>uuv_sensor_ros_plugins</exec_depend>
<exec_depend>ds_sim</exec_depend>

<depend>gazebo_ros</depend>
<depend>uuv_sensor_ros_plugins</depend>
<depend>ds_sim</depend>
<export>
<gazebo_ros gazebo_model_path="${prefix}/models"/>
<gazebo_ros gazebo_media_path="${prefix}"/>
Expand Down