Fix CMakeLists (#111)

rt-net · Jan 4, 2021 · 8fc1085 · 8fc1085
1 parent 79c1ed6
commit 8fc1085
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 13 deletions.
diff --git a/sciurus17_control/CMakeLists.txt b/sciurus17_control/CMakeLists.txt
@@ -36,16 +36,18 @@ set(MESSAGE_DEPENDS sciurus17_msgs_generate_messages)
 install(TARGETS sciurus17_control
   RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
 )
-install(DIRECTORY launch
-  DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})
 
 install(DIRECTORY include/${PROJECT_NAME}/
   DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}
   FILES_MATCHING PATTERN "*.h"
   PATTERN ".svn" EXCLUDE
 )
-foreach(dir config launch scripts)
-  install(DIRECTORY ${dir}/ 
-    DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/${dir}
-  )
-endforeach(dir)
+
+install(DIRECTORY config launch
+  DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})
+
+file(GLOB python_scripts scripts/*.py)
+catkin_install_python(
+  PROGRAMS ${python_scripts}
+  DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
+)
diff --git a/sciurus17_examples/CMakeLists.txt b/sciurus17_examples/CMakeLists.txt
@@ -46,11 +46,16 @@ target_link_libraries(object_detection
 ## Install ##
 #############
 
-install(PROGRAMS
-  scripts/pick_and_place_left_arm_demo.py
-  scripts/pick_and_place_right_arm_demo.py
-  scripts/gripper_action_example.py
-  scripts/hand_position_publisher_example.py
-  scripts/neck_joint_trajectory_example.py
+install(TARGETS object_detection
+  RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
+)
+
+install(DIRECTORY launch
+  DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
+)
+
+file(GLOB python_scripts scripts/*.py)
+catkin_install_python(
+  PROGRAMS ${python_scripts}
   DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
 )
diff --git a/sciurus17_gazebo/CMakeLists.txt b/sciurus17_gazebo/CMakeLists.txt
@@ -22,3 +22,13 @@ link_directories(${GAZEBO_LIBRARY_DIRS})
 include_directories(
   ${catkin_INCLUDE_DIRS}
 )
+
+install(DIRECTORY launch worlds
+  DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
+)
+
+file(GLOB python_scripts scripts/*.py)
+catkin_install_python(
+  PROGRAMS ${python_scripts}
+  DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
+)
diff --git a/sciurus17_tools/CMakeLists.txt b/sciurus17_tools/CMakeLists.txt
@@ -29,5 +29,9 @@ target_link_libraries(realsense_hwreset
     ${CMAKE_THREAD_LIBS_INIT}
     )
 
+install(TARGETS realsense_hwreset
+  RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
+)
+
 install(DIRECTORY scripts rules DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})