install python files under CATKIN_PACKAGE_BIN_DESTINATION

jsk-ros-pkg · May 29, 2023 · 15c3e40 · 15c3e40
1 parent affc8a0
commit 15c3e40
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 46 deletions.
diff --git a/dialogflow_task_executive/CMakeLists.txt b/dialogflow_task_executive/CMakeLists.txt
@@ -70,13 +70,10 @@ else()
     )
 endif()
 
-file(GLOB NODE_SCRIPTS_FILES node_scripts/*.py)
+file(GLOB PYTHON_SCRIPT_FILES node_scripts/*.py test/*.py)
 catkin_install_python(
-  PROGRAMS ${NODE_SCRIPTS_FILES}
-  DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/node_scripts/)
-file(GLOB PYTHON_TEST_SCRIPTS test/*.py)
-catkin_install_python(PROGRAMS ${PYTHON_TEST_SCRIPTS}
-  DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/test/)
+  PROGRAMS ${PYTHON_SCRIPT_FILES}
+  DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION})
 
 install(DIRECTORY launch
   DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}

diff --git a/google_chat_ros/CMakeLists.txt b/google_chat_ros/CMakeLists.txt
@@ -44,13 +44,10 @@ install(FILES ${EUSLISP_SCRIPTS}
   DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/scripts/)
 
 # python
-file(GLOB PYTHON_SCRIPTS scripts/*.py)
+file(GLOB PYTHON_SCRIPT_FILES scripts/*.py  test/*.py)
 catkin_install_python(
-  PROGRAMS ${PYTHON_SCRIPTS}
-  DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/scripts/)
-file(GLOB PYTHON_TEST_SCRIPTS test/*.py)
-catkin_install_python(PROGRAMS ${PYTHON_TEST_SCRIPTS}
-  DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/test/)
+  PROGRAMS ${PYTHON_SCRIPT_FILES}
+  DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION})
 
 # python requirements
 install(FILES requirements.txt

diff --git a/nfc_ros/CMakeLists.txt b/nfc_ros/CMakeLists.txt
@@ -27,13 +27,10 @@ catkin_generate_virtualenv(
     PYTHON_INTERPRETER python3
     CHECK_VENV FALSE
 )
-file(GLOB NODE_SCRIPTS_FILES node_scripts/*.py)
+file(GLOB PYTHON_SCRIPT_FILES node_scripts/*.py test/*.py)
 catkin_install_python(
-  PROGRAMS ${NODE_SCRIPTS_FILES}
-  DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/node_scripts/)
-file(GLOB PYTHON_TEST_SCRIPTS test/*.py)
-catkin_install_python(PROGRAMS ${PYTHON_TEST_SCRIPTS}
-  DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/test/)
+  PROGRAMS ${PYTHON_SCRIPT_FILES}
+  DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION})
 
 install(FILES requirements.txt
     DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}

diff --git a/respeaker_ros/CMakeLists.txt b/respeaker_ros/CMakeLists.txt
@@ -33,12 +33,9 @@ install(FILES requirements.txt
   DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
 )
 
-file(GLOB PYTHON_SCRIPTS scripts/*.py)
-catkin_install_python(PROGRAMS ${PYTHON_SCRIPTS}
-  DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/scripts/)
-file(GLOB PYTHON_TEST_SCRIPTS test/*.py)
-catkin_install_python(PROGRAMS ${PYTHON_TEST_SCRIPTS}
-  DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/test/)
+file(GLOB PYTHON_SCRIPT_FILES scripts/*.py test/*.py)
+catkin_install_python(PROGRAMS ${PYTHON_SCRIPT_FILES}
+  DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION})
 
 if(CATKIN_ENABLE_TESTING)
   find_package(rostest REQUIRED)

diff --git a/ros_google_cloud_language/CMakeLists.txt b/ros_google_cloud_language/CMakeLists.txt
@@ -55,13 +55,10 @@ catkin_generate_virtualenv(
 
 include_directories()
 
-file(GLOB NODE_SCRIPTS_FILES node_scripts/*.py)
+file(GLOB PYTHON_SCRIPT_FILES node_scripts/*.py test/*.py)
 catkin_install_python(
-  PROGRAMS ${NODE_SCRIPTS_FILES}
-  DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/node_scripts/)
-file(GLOB PYTHON_TEST_SCRIPTS test/*.py)
-catkin_install_python(PROGRAMS ${PYTHON_TEST_SCRIPTS}
-  DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/test/)
+  PROGRAMS ${PYTHON_SCRIPT_FILES}
+  DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION})
 
 install(DIRECTORY launch samples
   DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}

diff --git a/ros_speech_recognition/CMakeLists.txt b/ros_speech_recognition/CMakeLists.txt
@@ -24,13 +24,10 @@ else()
     )
 endif()
 
-file(GLOB SCRIPT_PROGRAMS scripts/*.py)
+file(GLOB PYTHON_SCRIPT_FILES scripts/*.py test/*.py)
 catkin_install_python(
-  PROGRAMS ${SCRIPT_PROGRAMS}
-  DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/scripts/)
-file(GLOB PYTHON_TEST_SCRIPTS test/*.py)
-catkin_install_python(PROGRAMS ${PYTHON_TEST_SCRIPTS}
-  DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/test/)
+  PROGRAMS ${PYTHON_SCRIPT_FILES}
+  DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION})
 
 install(DIRECTORY launch
   DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})

diff --git a/sesame_ros/CMakeLists.txt b/sesame_ros/CMakeLists.txt
@@ -32,17 +32,10 @@ endif()
 
 include_directories()
 
-file(GLOB NODE_SCRIPTS_FILES node_scripts/*)
+file(GLOB PYTHON_SCRIPT_FILES node_scripts/* scripts/* test/*.py)
 catkin_install_python(
-  PROGRAMS ${NODE_SCRIPTS_FILES}
-  DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/node_scripts/)
-file(GLOB SCRIPTS_FILES scripts/*)
-catkin_install_python(
-  PROGRAMS ${SCRIPTS_FILES}
-  DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/scripts/)
-file(GLOB PYTHON_TEST_SCRIPTS test/*.py)
-catkin_install_python(PROGRAMS ${PYTHON_TEST_SCRIPTS}
-  DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/test/)
+  PROGRAMS ${PYTHON_SCRIPT_FILES}
+  DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION})
 
 install(FILES requirements.txt
   DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}