From 081fb349c89495be4060876ad09fe2d18218cac2 Mon Sep 17 00:00:00 2001 From: Katie Hamilton Date: Mon, 4 Nov 2024 15:47:56 -0800 Subject: [PATCH] Got the ground bridge node executable in the ground bridge debian. --- .../ground_dds_ros_bridge/CMakeLists.txt | 17 +++++++++-------- debian/astrobee-ground-comms.files | 1 + 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/communications/ground_dds_ros_bridge/CMakeLists.txt b/communications/ground_dds_ros_bridge/CMakeLists.txt index 595674f2d2..1961916f1f 100644 --- a/communications/ground_dds_ros_bridge/CMakeLists.txt +++ b/communications/ground_dds_ros_bridge/CMakeLists.txt @@ -115,14 +115,6 @@ target_link_libraries(ground_dds_ros_bridge_node ground_dds_ros_bridge ${catkin_ # Determine our module name get_filename_component(MODULE_NAME ${CMAKE_CURRENT_SOURCE_DIR} NAME) -install(CODE "execute_process( - COMMAND mkdir -p share/${MODULE_NAME} - COMMAND ln -s ../../bin/ground_dds_ros_bridge share/${MODULE_NAME} - WORKING_DIRECOTRY ${CMAKE_INSTALL_PREFIX} - OUTPUT_QUIET - ERROR_QUIET - )") - # Mark libraries for installation install(TARGETS ground_dds_ros_bridge ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION} @@ -135,6 +127,15 @@ install(TARGETS ground_dds_ros_bridge # DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION} #) +# Install C++ executables +install(TARGETS ground_dds_ros_bridge_node DESTINATION bin) +install(CODE "execute_process( + COMMAND ln -s ../../bin/ground_dds_ros_bridge_node share/${MODULE_NAME} + WORKING_DIRECOTRY ${CMAKE_INSTALL_PREFIX} + OUTPUT_QUIET + ERROR_QUIET + )") + # Mark launch files for installation install(DIRECTORY launch/ DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/launch diff --git a/debian/astrobee-ground-comms.files b/debian/astrobee-ground-comms.files index 339a2029b7..ae7e625c8f 100644 --- a/debian/astrobee-ground-comms.files +++ b/debian/astrobee-ground-comms.files @@ -1,2 +1,3 @@ opt/astrobee/lib/libground_dds_ros_bridge.so +opt/astrobee/bin/ground_dds_ros_bridge_node opt/astrobee/share/ground_dds_ros_bridge