Skip to content
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

Fix installs for binaries and directories #8

Closed
wants to merge 2 commits into from
Closed

Fix installs for binaries and directories #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
269fdbf
Add binary installs
Feb 4, 2021
36730ad
Add missing directory installs
Feb 4, 2021
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
2 changes: 2 additions & 0 deletions rslidar_driver/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,3 +52,5 @@ install(
FILES nodelet_rslidar.xml
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
)

install(DIRECTORY cfg DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})
23 changes: 23 additions & 0 deletions rslidar_driver/src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,36 @@ target_link_libraries(rslidar_input
${catkin_LIBRARIES}
${libpcap_LIBRARIES})

install(TARGETS rslidar_input
RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
)

add_library(rslidar_driver rsdriver.cpp)
target_link_libraries(rslidar_driver
rslidar_input
${catkin_LIBRARIES})

install(TARGETS rslidar_driver
RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
)

# build the nodelet version
add_library(rslidar_driver_nodelet nodelet.cc rsdriver.cpp)
target_link_libraries(rslidar_driver_nodelet
rslidar_input
${catkin_LIBRARIES}
)

install(TARGETS rslidar_driver_nodelet
RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
)

add_executable(rslidar_node rslidar_node.cpp)

if(catkin_EXPORTED_TARGETS)
Expand All @@ -28,3 +46,8 @@ target_link_libraries(rslidar_node
${libpcap_LIBRARIES}
)

install(TARGETS rslidar_node
RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
)
5 changes: 5 additions & 0 deletions rslidar_pointcloud/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,8 @@ install(
FILES nodelets.xml
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
)

install(DIRECTORY launch DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})
install(DIRECTORY data DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})
install(DIRECTORY rviz_cfg DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})
install(DIRECTORY cfg DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})
23 changes: 23 additions & 0 deletions rslidar_pointcloud/src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,33 @@ target_link_libraries(rslidar_data
${catkin_LIBRARIES}
${libpcap_LIBRARIES})

install(TARGETS rslidar_data
RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
)

add_library(rslidar_point convert.cc)
target_link_libraries(rslidar_point
rslidar_data
${catkin_LIBRARIES})

install(TARGETS rslidar_point
RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
)

add_library(rslidar_cloud_nodelet cloud_nodelet.cc)
target_link_libraries(rslidar_cloud_nodelet rslidar_point
${catkin_LIBRARIES})

install(TARGETS rslidar_cloud_nodelet
RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
)

add_executable(rslidar_cloud_node cloud_node.cc)

if(catkin_EXPORTED_TARGETS)
Expand All @@ -23,3 +40,9 @@ target_link_libraries(rslidar_cloud_node
rslidar_point
${catkin_LIBRARIES}
${libpcap_LIBRARIES})

install(TARGETS rslidar_cloud_node
RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
)
15 changes: 15 additions & 0 deletions rslidar_sync/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,22 @@ target_link_libraries(rslidar_sync_2lidar_node
${catkin_LIBRARIES}
)

install(TARGETS rslidar_sync_2lidar_node
RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
)

add_executable(rslidar_sync_3lidar_node src/timesync_3lidar.cpp)
target_link_libraries(rslidar_sync_3lidar_node
${catkin_LIBRARIES}
)

install(TARGETS rslidar_sync_3lidar_node
RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
)

install(DIRECTORY launch DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})
install(DIRECTORY rviz_cfg DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})