Skip to content

Commit

Permalink
refactored cmakelists
Browse files Browse the repository at this point in the history
  • Loading branch information
klaxalk committed Sep 16, 2023
1 parent 54c9653 commit 5943283
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 33 deletions.
3 changes: 0 additions & 3 deletions .github/workflows/ros_package_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ on:
push:
branches: [ hw_api ]

pull_request:
branches: [ hw_api ]

workflow_dispatch:

concurrency:
Expand Down
33 changes: 17 additions & 16 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,23 +1,24 @@
cmake_minimum_required(VERSION 3.1.2)
cmake_minimum_required(VERSION 3.5)
project(mrs_bumper)

set(CATKIN_DEPENDENCIES
cmake_modules
roscpp
nodelet
cv_bridge
dynamic_reconfigure
tf2_ros
tf2_geometry_msgs
sensor_msgs
geometry_msgs
cv_bridge
image_transport
image_geometry
pcl_ros
pcl_conversions
pcl_msgs
image_transport
message_runtime
mrs_lib
mrs_msgs
nodelet
pcl_conversions
pcl_msgs
pcl_ros
roscpp
sensor_msgs
tf2_geometry_msgs
tf2_ros
)

find_package(catkin REQUIRED COMPONENTS
Expand Down Expand Up @@ -55,7 +56,7 @@ set(EXECUTABLES
)

set(LIBRARIES
Bumper
MrsBumper_Bumper
)

catkin_package(
Expand All @@ -77,16 +78,16 @@ include_directories(include

# bumper

add_library(Bumper
add_library(MrsBumper_Bumper
src/bumper_nodelet.cpp
)

add_dependencies(Bumper
add_dependencies(MrsBumper_Bumper
${${PROJECT_NAME}_EXPORTED_TARGETS}
${catkin_EXPORTED_TARGETS}
)

target_link_libraries(Bumper
target_link_libraries(MrsBumper_Bumper
${catkin_LIBRARIES}
${OpenCV_LIBRARIES}
${PCL_LIBRARIES}
Expand Down Expand Up @@ -126,6 +127,6 @@ install(DIRECTORY launch config
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
)

install(FILES plugins.xml
install(FILES nodelets.xml
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
)
2 changes: 1 addition & 1 deletion plugins.xml → nodelets.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<library path="lib/libBumper">
<library path="lib/libMrsBumper_Bumper">
<class name="mrs_bumper/Bumper" type="mrs_bumper::Bumper" base_class_type="nodelet::Nodelet">
<description>Nodelet for publishing rough object positions for reactive collision avoidance</description>
</class>
Expand Down
25 changes: 12 additions & 13 deletions package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,26 +13,25 @@
<buildtool_depend>catkin</buildtool_depend>

<depend>cmake_modules</depend>
<depend>roscpp</depend>
<depend>nodelet</depend>
<depend>cv_bridge</depend>
<depend>dynamic_reconfigure</depend>
<depend>tf2_ros</depend>
<depend>tf2_geometry_msgs</depend>
<depend>sensor_msgs</depend>
<depend>geometry_msgs</depend>
<depend>cv_bridge</depend>
<depend>image_transport</depend>
<depend>image_geometry</depend>
<depend>pcl_ros</depend>
<depend>pcl_conversions</depend>
<depend>pcl_msgs</depend>
<depend>image_transport</depend>
<depend>message_runtime</depend>
<depend>mrs_lib</depend>
<depend>mrs_msgs</depend>

<exec_depend>message_runtime</exec_depend>
<depend>nodelet</depend>
<depend>pcl_conversions</depend>
<depend>pcl_msgs</depend>
<depend>pcl_ros</depend>
<depend>roscpp</depend>
<depend>sensor_msgs</depend>
<depend>tf2_geometry_msgs</depend>
<depend>tf2_ros</depend>

<export>
<nodelet plugin="${prefix}/plugins.xml" />
<nodelet plugin="${prefix}/nodelets.xml" />
</export>

</package>

0 comments on commit 5943283

Please sign in to comment.