Cleanup cmake install rules (#358)

v4hn · rhaschke · commit 2b96b447ec15 · 2019-07-11T15:29:53.000+02:00
* install missing launch folders
* install missing binaries
* install, but do not expose libinteractivity_utils
  This lib is not meant as a public interface.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -30,7 +30,6 @@ set(THIS_PACKAGE_INCLUDE_DIRS
 
 catkin_package(
   LIBRARIES
-    interactivity_utils
   INCLUDE_DIRS
   CATKIN_DEPENDS
     moveit_core
diff --git a/doc/interactivity/CMakeLists.txt b/doc/interactivity/CMakeLists.txt
@@ -36,7 +36,7 @@ install(
     ${INTERACTIVITY_LIB_NAME}
   LIBRARY
   DESTINATION
-    ${CATKIN_PACKAGE_SHARE_DESTINATION}
+    ${CATKIN_PACKAGE_LIB_DESTINATION}
 )
 
-install(DIRECTORY include/ DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})
+install(DIRECTORY launch DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})
diff --git a/doc/kinematics/CMakeLists.txt b/doc/kinematics/CMakeLists.txt
@@ -1,4 +1,5 @@
 add_executable(ros_api_tutorial src/ros_api_tutorial.cpp)
 target_link_libraries(ros_api_tutorial ${catkin_LIBRARIES} ${Boost_LIBRARIES})
 
+install(TARGETS ros_api_tutorial DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION})
 install(DIRECTORY launch DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})
diff --git a/doc/motion_planning_api/CMakeLists.txt b/doc/motion_planning_api/CMakeLists.txt
@@ -2,3 +2,4 @@ add_executable(motion_planning_api_tutorial src/motion_planning_api_tutorial.cpp
 target_link_libraries(motion_planning_api_tutorial ${catkin_LIBRARIES} ${Boost_LIBRARIES})
 install(TARGETS motion_planning_api_tutorial DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION})
 
+install(DIRECTORY launch DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})
diff --git a/doc/motion_planning_pipeline/CMakeLists.txt b/doc/motion_planning_pipeline/CMakeLists.txt
@@ -2,3 +2,4 @@ add_executable(motion_planning_pipeline_tutorial src/motion_planning_pipeline_tu
 target_link_libraries(motion_planning_pipeline_tutorial ${catkin_LIBRARIES} ${Boost_LIBRARIES})
 install(TARGETS motion_planning_pipeline_tutorial DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION})
 
+install(DIRECTORY launch DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})
diff --git a/doc/move_group_interface/CMakeLists.txt b/doc/move_group_interface/CMakeLists.txt
@@ -2,3 +2,4 @@ add_executable(move_group_interface_tutorial src/move_group_interface_tutorial.c
 target_link_libraries(move_group_interface_tutorial ${catkin_LIBRARIES} ${Boost_LIBRARIES})
 install(TARGETS move_group_interface_tutorial DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION})
 
+install(DIRECTORY launch DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})
diff --git a/doc/move_group_python_interface/CMakeLists.txt b/doc/move_group_python_interface/CMakeLists.txt
@@ -1,5 +1,6 @@
-install(DIRECTORY launch DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})
 install(PROGRAMS
   scripts/move_group_python_interface_tutorial.py
   DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
 )
+
+install(DIRECTORY launch DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})
diff --git a/doc/perception_pipeline/CMakeLists.txt b/doc/perception_pipeline/CMakeLists.txt
@@ -3,3 +3,11 @@ target_link_libraries(cylinder_segment ${catkin_LIBRARIES})
 
 add_executable(bag_publisher_maintain_time src/bag_publisher_maintain_time.cpp)
 target_link_libraries(bag_publisher_maintain_time ${catkin_LIBRARIES} ${Boost_LIBRARIES})
+
+install(
+TARGETS
+	bag_publisher_maintain_time
+	cylinder_segment
+DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION})
+
+install(DIRECTORY launch DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})
diff --git a/doc/planning_scene/CMakeLists.txt b/doc/planning_scene/CMakeLists.txt
@@ -1,3 +1,5 @@
 add_executable(planning_scene_tutorial src/planning_scene_tutorial.cpp)
 target_link_libraries(planning_scene_tutorial ${catkin_LIBRARIES} ${Boost_LIBRARIES})
 install(TARGETS planning_scene_tutorial DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION})
+
+install(DIRECTORY launch DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})
diff --git a/doc/planning_scene_ros_api/CMakeLists.txt b/doc/planning_scene_ros_api/CMakeLists.txt
@@ -1,3 +1,5 @@
 add_executable(planning_scene_ros_api_tutorial src/planning_scene_ros_api_tutorial.cpp)
 target_link_libraries(planning_scene_ros_api_tutorial ${catkin_LIBRARIES} ${Boost_LIBRARIES})
 install(TARGETS planning_scene_ros_api_tutorial DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION})
+
+install(DIRECTORY launch DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ install(`
`36`	`36`	`${INTERACTIVITY_LIB_NAME}`
`37`	`37`	`LIBRARY`
`38`	`38`	`DESTINATION`
`39`		`- ${CATKIN_PACKAGE_SHARE_DESTINATION}`
	`39`	`+ ${CATKIN_PACKAGE_LIB_DESTINATION}`
`40`	`40`	`)`
`41`	`41`
`42`		`-install(DIRECTORY include/ DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})`
	`42`	`+install(DIRECTORY launch DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})`
Original file line number	Diff line number	Diff line change
`@@ -2,3 +2,4 @@ add_executable(motion_planning_api_tutorial src/motion_planning_api_tutorial.cpp`
`2`	`2`	`target_link_libraries(motion_planning_api_tutorial ${catkin_LIBRARIES} ${Boost_LIBRARIES})`
`3`	`3`	`install(TARGETS motion_planning_api_tutorial DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION})`
`4`	`4`
	`5`	`+install(DIRECTORY launch DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})`
Original file line number	Diff line number	Diff line change
`@@ -2,3 +2,4 @@ add_executable(motion_planning_pipeline_tutorial src/motion_planning_pipeline_tu`
`2`	`2`	`target_link_libraries(motion_planning_pipeline_tutorial ${catkin_LIBRARIES} ${Boost_LIBRARIES})`
`3`	`3`	`install(TARGETS motion_planning_pipeline_tutorial DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION})`
`4`	`4`
	`5`	`+install(DIRECTORY launch DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})`
Original file line number	Diff line number	Diff line change
`@@ -2,3 +2,4 @@ add_executable(move_group_interface_tutorial src/move_group_interface_tutorial.c`
`2`	`2`	`target_link_libraries(move_group_interface_tutorial ${catkin_LIBRARIES} ${Boost_LIBRARIES})`
`3`	`3`	`install(TARGETS move_group_interface_tutorial DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION})`
`4`	`4`
	`5`	`+install(DIRECTORY launch DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`		`-install(DIRECTORY launch DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})`
`2`	`1`	`install(PROGRAMS`
`3`	`2`	`scripts/move_group_python_interface_tutorial.py`
`4`	`3`	`DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}`
`5`	`4`	`)`
	`5`	`+`
	`6`	`+install(DIRECTORY launch DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})`