From ce0a10db8684ee45865027d6d01deb66ab167e65 Mon Sep 17 00:00:00 2001 From: Wouter Heerwegh Date: Tue, 20 Sep 2022 15:38:50 +0200 Subject: [PATCH] Make compilable for both noetic and melodic --- ros/src/fsds_ros_bridge/CMakeLists.txt | 5 ++++- ros/src/fsds_ros_bridge/scripts/cameralauncher.py | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ros/src/fsds_ros_bridge/CMakeLists.txt b/ros/src/fsds_ros_bridge/CMakeLists.txt index 462aa6aa..55f523f8 100644 --- a/ros/src/fsds_ros_bridge/CMakeLists.txt +++ b/ros/src/fsds_ros_bridge/CMakeLists.txt @@ -91,4 +91,7 @@ install(DIRECTORY rviz DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION} # PATTERN ".git" EXCLUDE -) \ No newline at end of file +) + +catkin_install_python(PROGRAMS scripts/cameralauncher.py + DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}) \ No newline at end of file diff --git a/ros/src/fsds_ros_bridge/scripts/cameralauncher.py b/ros/src/fsds_ros_bridge/scripts/cameralauncher.py index 80c49f77..cdb384be 100755 --- a/ros/src/fsds_ros_bridge/scripts/cameralauncher.py +++ b/ros/src/fsds_ros_bridge/scripts/cameralauncher.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3 +#!/usr/bin/env python import roslaunch from os.path import expanduser import json