From de0d27ea6706d81826b7a680c373a832229ff4f8 Mon Sep 17 00:00:00 2001 From: Kei Okada Date: Wed, 11 Dec 2024 13:59:19 +0900 Subject: [PATCH] jsk_interactive_marker: use catkin_install_python in CMakeLists.txt --- .../jsk_interactive_marker/CMakeLists.txt | 8 +++++++- .../jsk_interactive_marker/setup.py | 11 +++++++++++ .../src/jsk_interactive_marker/.placeholder | 0 3 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 jsk_interactive_markers/jsk_interactive_marker/setup.py create mode 100644 jsk_interactive_markers/jsk_interactive_marker/src/jsk_interactive_marker/.placeholder diff --git a/jsk_interactive_markers/jsk_interactive_marker/CMakeLists.txt b/jsk_interactive_markers/jsk_interactive_marker/CMakeLists.txt index 63e53c41b..4324c116f 100644 --- a/jsk_interactive_markers/jsk_interactive_marker/CMakeLists.txt +++ b/jsk_interactive_markers/jsk_interactive_marker/CMakeLists.txt @@ -62,6 +62,7 @@ add_service_files(DIRECTORY srv SnapFootPrint.srv SetHeuristic.srv) +catkin_setup_python() generate_dynamic_reconfigure_options( cfg/FootstepMarker.cfg cfg/InteractivePointCloud.cfg @@ -240,7 +241,12 @@ install(TARGETS jsk_interactive_marker LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION} ) -install(DIRECTORY config euslisp launch models scripts urdf +file(GLOB PYTHON_SCRIPTS scripts/*.py) +catkin_install_python( + PROGRAMS ${PYTHON_SCRIPTS} + DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION} +) +install(DIRECTORY config euslisp launch models urdf DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION} USE_SOURCE_PERMISSIONS PATTERN ".svn" EXCLUDE diff --git a/jsk_interactive_markers/jsk_interactive_marker/setup.py b/jsk_interactive_markers/jsk_interactive_marker/setup.py new file mode 100644 index 000000000..9ed1a73a8 --- /dev/null +++ b/jsk_interactive_markers/jsk_interactive_marker/setup.py @@ -0,0 +1,11 @@ +#!/usr/bin/env python + +from distutils.core import setup +from catkin_pkg.python_setup import generate_distutils_setup + +d = generate_distutils_setup( + packages=['jsk_interactive_marker'], + package_dir={'': 'src'} +) + +setup(**d) diff --git a/jsk_interactive_markers/jsk_interactive_marker/src/jsk_interactive_marker/.placeholder b/jsk_interactive_markers/jsk_interactive_marker/src/jsk_interactive_marker/.placeholder new file mode 100644 index 000000000..e69de29bb