jsk_rqt_plugins/jsk_rviz_plugins: use catkin_install_python in CMakeL…

…ists.txt
jsk-ros-pkg · Dec 11, 2024 · 18d78d6 · 18d78d6
1 parent 044421b
commit 18d78d6
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 6 deletions.
diff --git a/jsk_rqt_plugins/CMakeLists.txt b/jsk_rqt_plugins/CMakeLists.txt
@@ -18,17 +18,34 @@ catkin_package()
 # recursively into ${CATKIN_PACKAGE_SHARE_DESTINATION}.
 # Be careful that 'launch' and 'launch/' are different: the former is directory
 # and the latter is each content.
-install(DIRECTORY bin/
+file(GLOB PYTHON_SCRIPTS bin/*)
+catkin_install_python(
+  PROGRAMS ${PYTHON_SCRIPTS}
   DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
-  USE_SOURCE_PERMISSIONS
 )
 install(FILES plugin.xml
   DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
 )
-install(DIRECTORY launch resource sample sample_scripts test
+install(DIRECTORY launch resource sample sample_scripts
   DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
   USE_SOURCE_PERMISSIONS
 )
+file(GLOB PYTHON_SAMPLES sample_scripts/*.py)
+catkin_install_python(
+  PROGRAMS ${PYTHON_SAMPLES}
+  DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/sample_scripts
+)
+
+install(DIRECTORY test
+  DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
+  USE_SOURCE_PERMISSIONS
+  PATTERN "*.launch"
+)
+file(GLOB PYTHON_TEST test/*.py)
+catkin_install_python(
+  PROGRAMS ${PYTHON_TEST}
+  DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/test
+)
 
 if (CATKIN_ENABLE_TESTING)
   find_package(rostest REQUIRED)

diff --git a/jsk_rviz_plugins/CMakeLists.txt b/jsk_rviz_plugins/CMakeLists.txt
@@ -225,18 +225,24 @@ install(TARGETS jsk_rviz_plugins
   LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
 )
 
-install(DIRECTORY scripts/
+file(GLOB PYTHON_SCRIPTS scripts/*.py)
+catkin_install_python(
+  PROGRAMS ${PYTHON_SCRIPTS}
   DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
-  USE_SOURCE_PERMISSIONS
 )
 
 install(FILES plugin_description.xml
   DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
 )
-install(DIRECTORY cfg config icons launch samples test
+install(DIRECTORY cfg config icons launch test
   DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
   USE_SOURCE_PERMISSIONS
 )
+file(GLOB PYTHON_SAMPLES samples/*.py)
+catkin_install_python(
+  PROGRAMS ${PYTHON_SAMPLES}
+  DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/samples
+)
 
 install(DIRECTORY src/
   DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}