Merge pull request #332 from wouter-heerwegh/ros1_compilation

Make compilable for both noetic and melodic
FS-Driverless · Oct 18, 2022 · d6377ff · d6377ff
2 parents 2059814 + ce0a10d
commit d6377ff
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git 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
-)
+)
+
+catkin_install_python(PROGRAMS scripts/cameralauncher.py
+  DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION})
diff --git 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