[jsk_panda_teleop] Fix catkin_install_python usage

The same fixes as jsk-ros-pkg/jsk_recognition#2851 and jsk-ros-pkg/jsk_recognition#2859
jsk-ros-pkg · Dec 12, 2024 · 03730a0 · 03730a0
1 parent 25dd087
commit 03730a0
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 13 deletions.
diff --git a/jsk_panda_robot/jsk_panda_teleop/CMakeLists.txt b/jsk_panda_robot/jsk_panda_teleop/CMakeLists.txt
@@ -6,10 +6,6 @@ find_package(catkin REQUIRED
   message_generation
   )
 
-if(NOT $ENV{ROS_DISTRO} STREQUAL "indigo") # on noetic it needs catkin_install_python to support Python3 and it does not work on indigo for some reason...
-  catkin_python_setup()
-endif()
-
 add_service_files(
   FILES
   ControlBilateral.srv
@@ -23,7 +19,7 @@ install(DIRECTORY config launch script
   DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
   USE_SOURCE_PERMISSIONS
   )
-if(NOT $ENV{ROS_DISTRO} STREQUAL "indigo") # on noetic it needs catkin_install_python to support Python3 and it does not work on indigo for some reason...
+if($ENV{ROS_DISTRO} STREQUAL "indigo") # on noetic it needs catkin_install_python to support Python3 and it does not work on indigo for some reason...
   install(DIRECTORY python
     DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
     USE_SOURCE_PERMISSIONS

diff --git a/jsk_panda_robot/jsk_panda_teleop/setup.py b/jsk_panda_robot/jsk_panda_teleop/setup.py