From 6d8e88447cb4010ede53717be3c18a1d256ac2eb Mon Sep 17 00:00:00 2001 From: Alexis Paques Date: Thu, 2 Jan 2020 11:52:42 +0100 Subject: [PATCH 1/2] Install the nodes, libraries and configurations. --- rslidar_driver/src/CMakeLists.txt | 9 +++++++++ rslidar_pointcloud/CMakeLists.txt | 3 +++ rslidar_pointcloud/src/CMakeLists.txt | 10 ++++++++++ rslidar_sync/CMakeLists.txt | 9 +++++++++ 4 files changed, 31 insertions(+) diff --git a/rslidar_driver/src/CMakeLists.txt b/rslidar_driver/src/CMakeLists.txt index c1adf2a..f53b5b4 100644 --- a/rslidar_driver/src/CMakeLists.txt +++ b/rslidar_driver/src/CMakeLists.txt @@ -28,3 +28,12 @@ target_link_libraries(rslidar_node ${libpcap_LIBRARIES} ) +install(TARGETS + rslidar_input + rslidar_driver + driver_nodelet + rslidar_node + ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION} + LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION} + RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION} +) diff --git a/rslidar_pointcloud/CMakeLists.txt b/rslidar_pointcloud/CMakeLists.txt index 21bde31..5a34921 100644 --- a/rslidar_pointcloud/CMakeLists.txt +++ b/rslidar_pointcloud/CMakeLists.txt @@ -31,3 +31,6 @@ catkin_package( ) add_subdirectory(src) + +install(DIRECTORY launch data rviz_cfg + DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}) diff --git a/rslidar_pointcloud/src/CMakeLists.txt b/rslidar_pointcloud/src/CMakeLists.txt index 28a2167..819b5ac 100644 --- a/rslidar_pointcloud/src/CMakeLists.txt +++ b/rslidar_pointcloud/src/CMakeLists.txt @@ -23,3 +23,13 @@ target_link_libraries(cloud_node rslidar_point ${catkin_LIBRARIES} ${libpcap_LIBRARIES}) + +install(TARGETS + rslidar_data + rslidar_point + cloud_nodelet + cloud_node + ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION} + LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION} + RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION} +) diff --git a/rslidar_sync/CMakeLists.txt b/rslidar_sync/CMakeLists.txt index 8187af4..0b394d4 100644 --- a/rslidar_sync/CMakeLists.txt +++ b/rslidar_sync/CMakeLists.txt @@ -15,3 +15,12 @@ add_executable(rslidar_sync_3lidar_node src/timesync_3lidar.cpp) target_link_libraries(rslidar_sync_3lidar_node ${catkin_LIBRARIES} ) + +install(TARGETS + rslidar_sync_2lidar_node + rslidar_sync_3lidar_node + RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION} +) + +install(DIRECTORY launch rviz_cfg + DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}) From f7b394dc82416d1612ea9cb1161755dcc7220ce0 Mon Sep 17 00:00:00 2001 From: Alexis Paques Date: Thu, 2 Jan 2020 12:31:40 +0100 Subject: [PATCH 2/2] Install nodelets description files. --- rslidar_driver/CMakeLists.txt | 4 ++++ rslidar_pointcloud/CMakeLists.txt | 11 +++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/rslidar_driver/CMakeLists.txt b/rslidar_driver/CMakeLists.txt index c8d8fb0..3dd363c 100644 --- a/rslidar_driver/CMakeLists.txt +++ b/rslidar_driver/CMakeLists.txt @@ -48,3 +48,7 @@ catkin_package( add_subdirectory(src) +install( + FILES nodelet_rslidar.xml + DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION} +) diff --git a/rslidar_pointcloud/CMakeLists.txt b/rslidar_pointcloud/CMakeLists.txt index 5a34921..ab44e6b 100644 --- a/rslidar_pointcloud/CMakeLists.txt +++ b/rslidar_pointcloud/CMakeLists.txt @@ -32,5 +32,12 @@ catkin_package( add_subdirectory(src) -install(DIRECTORY launch data rviz_cfg - DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}) +install( + FILES nodelets.xml + DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION} +) + +install( + DIRECTORY launch data rviz_cfg + DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION} +)