Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add full VERSIONs / SONAMEs to our libraries #273

Merged
merged 2 commits into from Oct 19, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 2 additions & 3 deletions moveit_core/background_processing/CMakeLists.txt
@@ -1,8 +1,7 @@
set(MOVEIT_LIB_NAME moveit_background_processing)

add_library(${MOVEIT_LIB_NAME}
src/background_processing.cpp
)
add_library(${MOVEIT_LIB_NAME} src/background_processing.cpp)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

while its not worth changing, I prefer the previous format because it makes adding more files to the library list cleaner in the future

set_target_properties(${MOVEIT_LIB_NAME} PROPERTIES VERSION ${${PROJECT_NAME}_VERSION})
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Out of curiosity, where is the value of ${${PROJECT_NAME}_VERSION} set?


target_link_libraries(${MOVEIT_LIB_NAME} ${catkin_LIBRARIES} ${console_bridge_LIBRARIES} ${urdfdom_LIBRARIES} ${urdfdom_headers_LIBRARIES} ${Boost_LIBRARIES})

Expand Down
1 change: 1 addition & 0 deletions moveit_core/collision_detection/CMakeLists.txt
Expand Up @@ -11,6 +11,7 @@ add_library(${MOVEIT_LIB_NAME}
src/world.cpp
src/world_diff.cpp
)
set_target_properties(${MOVEIT_LIB_NAME} PROPERTIES VERSION ${${PROJECT_NAME}_VERSION})

target_link_libraries(${MOVEIT_LIB_NAME} moveit_robot_state ${catkin_LIBRARIES} ${console_bridge_LIBRARIES} ${urdfdom_LIBRARIES} ${urdfdom_headers_LIBRARIES} ${Boost_LIBRARIES})
add_dependencies(${MOVEIT_LIB_NAME} ${catkin_EXPORTED_TARGETS})
Expand Down
1 change: 1 addition & 0 deletions moveit_core/collision_detection_fcl/CMakeLists.txt
Expand Up @@ -5,6 +5,7 @@ add_library(${MOVEIT_LIB_NAME}
src/collision_robot_fcl.cpp
src/collision_world_fcl.cpp
)
set_target_properties(${MOVEIT_LIB_NAME} PROPERTIES VERSION ${${PROJECT_NAME}_VERSION})

target_link_libraries(${MOVEIT_LIB_NAME} moveit_collision_detection ${catkin_LIBRARIES} ${console_bridge_LIBRARIES} ${urdfdom_LIBRARIES} ${urdfdom_headers_LIBRARIES} ${LIBFCL_LIBRARIES} ${Boost_LIBRARIES})
add_dependencies(${MOVEIT_LIB_NAME} ${catkin_EXPORTED_TARGETS})
Expand Down
1 change: 1 addition & 0 deletions moveit_core/constraint_samplers/CMakeLists.txt
Expand Up @@ -7,6 +7,7 @@ add_library(${MOVEIT_LIB_NAME}
src/default_constraint_samplers.cpp
src/union_constraint_sampler.cpp
)
set_target_properties(${MOVEIT_LIB_NAME} PROPERTIES VERSION ${${PROJECT_NAME}_VERSION})

target_link_libraries(${MOVEIT_LIB_NAME}
moveit_robot_state
Expand Down
1 change: 1 addition & 0 deletions moveit_core/distance_field/CMakeLists.txt
Expand Up @@ -5,6 +5,7 @@ add_library(${MOVEIT_LIB_NAME}
src/find_internal_points.cpp
src/propagation_distance_field.cpp
)
set_target_properties(${MOVEIT_LIB_NAME} PROPERTIES VERSION ${${PROJECT_NAME}_VERSION})

target_link_libraries(${MOVEIT_LIB_NAME} ${catkin_LIBRARIES} ${console_bridge_LIBRARIES} ${urdfdom_LIBRARIES} ${urdfdom_headers_LIBRARIES} ${Boost_LIBRARIES})
add_dependencies(${MOVEIT_LIB_NAME} ${catkin_EXPORTED_TARGETS})
Expand Down
4 changes: 2 additions & 2 deletions moveit_core/dynamics_solver/CMakeLists.txt
@@ -1,7 +1,7 @@
set(MOVEIT_LIB_NAME moveit_dynamics_solver)

add_library(${MOVEIT_LIB_NAME}
src/dynamics_solver.cpp)
add_library(${MOVEIT_LIB_NAME} src/dynamics_solver.cpp)
set_target_properties(${MOVEIT_LIB_NAME} PROPERTIES VERSION ${${PROJECT_NAME}_VERSION})

target_link_libraries(${MOVEIT_LIB_NAME} moveit_robot_state ${catkin_LIBRARIES} ${console_bridge_LIBRARIES} ${urdfdom_LIBRARIES} ${urdfdom_headers_LIBRARIES} ${Boost_LIBRARIES})
add_dependencies(${MOVEIT_LIB_NAME} ${catkin_EXPORTED_TARGETS})
Expand Down
1 change: 1 addition & 0 deletions moveit_core/exceptions/CMakeLists.txt
@@ -1,6 +1,7 @@
set(MOVEIT_LIB_NAME moveit_exceptions)

add_library(${MOVEIT_LIB_NAME} src/exceptions.cpp)
set_target_properties(${MOVEIT_LIB_NAME} PROPERTIES VERSION ${${PROJECT_NAME}_VERSION})

target_link_libraries(${MOVEIT_LIB_NAME} ${catkin_LIBRARIES} ${console_bridge_LIBRARIES} ${urdfdom_LIBRARIES} ${urdfdom_headers_LIBRARIES} ${Boost_LIBRARIES})

Expand Down
1 change: 1 addition & 0 deletions moveit_core/kinematic_constraints/CMakeLists.txt
Expand Up @@ -3,6 +3,7 @@ set(MOVEIT_LIB_NAME moveit_kinematic_constraints)
add_library(${MOVEIT_LIB_NAME}
src/kinematic_constraint.cpp
src/utils.cpp)
set_target_properties(${MOVEIT_LIB_NAME} PROPERTIES VERSION ${${PROJECT_NAME}_VERSION})

target_link_libraries(${MOVEIT_LIB_NAME}
moveit_robot_model moveit_kinematics_base moveit_robot_state moveit_collision_detection_fcl
Expand Down
2 changes: 1 addition & 1 deletion moveit_core/kinematics_base/CMakeLists.txt
@@ -1,7 +1,7 @@

set(MOVEIT_LIB_NAME moveit_kinematics_base)

add_library(${MOVEIT_LIB_NAME} src/kinematics_base.cpp)
set_target_properties(${MOVEIT_LIB_NAME} PROPERTIES VERSION ${${PROJECT_NAME}_VERSION})

# This line is needed to ensure that messages are done being built before this is built
add_dependencies(${MOVEIT_LIB_NAME} ${catkin_EXPORTED_TARGETS})
Expand Down
4 changes: 2 additions & 2 deletions moveit_core/kinematics_metrics/CMakeLists.txt
@@ -1,7 +1,7 @@
set(MOVEIT_LIB_NAME moveit_kinematics_metrics)

add_library(${MOVEIT_LIB_NAME}
src/kinematics_metrics.cpp)
add_library(${MOVEIT_LIB_NAME} src/kinematics_metrics.cpp)
set_target_properties(${MOVEIT_LIB_NAME} PROPERTIES VERSION ${${PROJECT_NAME}_VERSION})

target_link_libraries(${MOVEIT_LIB_NAME} moveit_robot_state ${catkin_LIBRARIES} ${console_bridge_LIBRARIES} ${urdfdom_LIBRARIES} ${urdfdom_headers_LIBRARIES} ${Boost_LIBRARIES})
add_dependencies(${MOVEIT_LIB_NAME} ${catkin_EXPORTED_TARGETS})
Expand Down
1 change: 1 addition & 0 deletions moveit_core/planning_interface/CMakeLists.txt
Expand Up @@ -4,6 +4,7 @@ add_library(${MOVEIT_LIB_NAME}
src/planning_interface.cpp
src/planning_response.cpp
)
set_target_properties(${MOVEIT_LIB_NAME} PROPERTIES VERSION ${${PROJECT_NAME}_VERSION})

target_link_libraries(${MOVEIT_LIB_NAME} moveit_robot_state moveit_robot_trajectory ${catkin_LIBRARIES} ${console_bridge_LIBRARIES} ${urdfdom_LIBRARIES} ${urdfdom_headers_LIBRARIES} ${Boost_LIBRARIES})
add_dependencies(${MOVEIT_LIB_NAME} ${catkin_EXPORTED_TARGETS})
Expand Down
1 change: 1 addition & 0 deletions moveit_core/planning_request_adapter/CMakeLists.txt
@@ -1,6 +1,7 @@
set(MOVEIT_LIB_NAME moveit_planning_request_adapter)

add_library(${MOVEIT_LIB_NAME} src/planning_request_adapter.cpp)
set_target_properties(${MOVEIT_LIB_NAME} PROPERTIES VERSION ${${PROJECT_NAME}_VERSION})

target_link_libraries(${MOVEIT_LIB_NAME} moveit_planning_scene ${catkin_LIBRARIES} ${console_bridge_LIBRARIES} ${urdfdom_LIBRARIES} ${urdfdom_headers_LIBRARIES} ${Boost_LIBRARIES})
add_dependencies(${MOVEIT_LIB_NAME} ${catkin_EXPORTED_TARGETS})
Expand Down
1 change: 1 addition & 0 deletions moveit_core/planning_scene/CMakeLists.txt
@@ -1,6 +1,7 @@
set(MOVEIT_LIB_NAME moveit_planning_scene)

add_library(${MOVEIT_LIB_NAME} src/planning_scene.cpp)
set_target_properties(${MOVEIT_LIB_NAME} PROPERTIES VERSION ${${PROJECT_NAME}_VERSION})

target_link_libraries(${MOVEIT_LIB_NAME}
moveit_robot_model
Expand Down
4 changes: 2 additions & 2 deletions moveit_core/profiler/CMakeLists.txt
@@ -1,7 +1,7 @@
set(MOVEIT_LIB_NAME moveit_profiler)

add_library(${MOVEIT_LIB_NAME}
src/profiler.cpp)
add_library(${MOVEIT_LIB_NAME} src/profiler.cpp)
set_target_properties(${MOVEIT_LIB_NAME} PROPERTIES VERSION ${${PROJECT_NAME}_VERSION})

target_link_libraries(${MOVEIT_LIB_NAME} ${catkin_LIBRARIES} ${console_bridge_LIBRARIES} ${urdfdom_LIBRARIES} ${urdfdom_headers_LIBRARIES} ${Boost_LIBRARIES})

Expand Down
1 change: 1 addition & 0 deletions moveit_core/robot_model/CMakeLists.txt
Expand Up @@ -11,6 +11,7 @@ add_library(${MOVEIT_LIB_NAME}
src/revolute_joint_model.cpp
src/robot_model.cpp
)
set_target_properties(${MOVEIT_LIB_NAME} PROPERTIES VERSION ${${PROJECT_NAME}_VERSION})

target_link_libraries(${MOVEIT_LIB_NAME} moveit_profiler moveit_exceptions moveit_kinematics_base ${catkin_LIBRARIES} ${console_bridge_LIBRARIES} ${urdfdom_LIBRARIES} ${urdfdom_headers_LIBRARIES} ${Boost_LIBRARIES})
add_dependencies(${MOVEIT_LIB_NAME} ${catkin_EXPORTED_TARGETS})
Expand Down
1 change: 1 addition & 0 deletions moveit_core/robot_state/CMakeLists.txt
Expand Up @@ -5,6 +5,7 @@ add_library(${MOVEIT_LIB_NAME}
src/conversions.cpp
src/robot_state.cpp
)
set_target_properties(${MOVEIT_LIB_NAME} PROPERTIES VERSION ${${PROJECT_NAME}_VERSION})

target_link_libraries(${MOVEIT_LIB_NAME} moveit_robot_model moveit_kinematics_base moveit_transforms ${catkin_LIBRARIES} ${console_bridge_LIBRARIES} ${urdfdom_LIBRARIES} ${urdfdom_headers_LIBRARIES} ${Boost_LIBRARIES})

Expand Down
5 changes: 2 additions & 3 deletions moveit_core/robot_trajectory/CMakeLists.txt
@@ -1,8 +1,7 @@
set(MOVEIT_LIB_NAME moveit_robot_trajectory)

add_library(${MOVEIT_LIB_NAME}
src/robot_trajectory.cpp
)
add_library(${MOVEIT_LIB_NAME} src/robot_trajectory.cpp)
set_target_properties(${MOVEIT_LIB_NAME} PROPERTIES VERSION ${${PROJECT_NAME}_VERSION})

target_link_libraries(${MOVEIT_LIB_NAME} moveit_robot_model moveit_robot_state ${catkin_LIBRARIES} ${console_bridge_LIBRARIES} ${urdfdom_LIBRARIES} ${urdfdom_headers_LIBRARIES} ${Boost_LIBRARIES})
add_dependencies(${MOVEIT_LIB_NAME} ${catkin_EXPORTED_TARGETS})
Expand Down
1 change: 1 addition & 0 deletions moveit_core/trajectory_processing/CMakeLists.txt
Expand Up @@ -4,6 +4,7 @@ add_library(${MOVEIT_LIB_NAME}
src/iterative_time_parameterization.cpp
src/trajectory_tools.cpp
)
set_target_properties(${MOVEIT_LIB_NAME} PROPERTIES VERSION ${${PROJECT_NAME}_VERSION})

target_link_libraries(${MOVEIT_LIB_NAME} moveit_robot_state moveit_robot_trajectory ${catkin_LIBRARIES} ${console_bridge_LIBRARIES} ${urdfdom_LIBRARIES} ${urdfdom_headers_LIBRARIES} ${Boost_LIBRARIES})
add_dependencies(${MOVEIT_LIB_NAME} ${catkin_EXPORTED_TARGETS})
Expand Down
5 changes: 2 additions & 3 deletions moveit_core/transforms/CMakeLists.txt
@@ -1,8 +1,7 @@
set(MOVEIT_LIB_NAME moveit_transforms)

add_library(${MOVEIT_LIB_NAME}
src/transforms.cpp
)
add_library(${MOVEIT_LIB_NAME} src/transforms.cpp)
set_target_properties(${MOVEIT_LIB_NAME} PROPERTIES VERSION ${${PROJECT_NAME}_VERSION})

target_link_libraries(${MOVEIT_LIB_NAME} ${catkin_LIBRARIES} ${console_bridge_LIBRARIES} ${urdfdom_LIBRARIES} ${urdfdom_headers_LIBRARIES} ${Boost_LIBRARIES})
add_dependencies(${MOVEIT_LIB_NAME} ${catkin_EXPORTED_TARGETS})
Expand Down
2 changes: 2 additions & 0 deletions moveit_experimental/collision_distance_field/CMakeLists.txt
Expand Up @@ -8,6 +8,7 @@ add_library(${MOVEIT_LIB_NAME}
src/collision_robot_hybrid.cpp
src/collision_world_hybrid.cpp
)
set_target_properties(${MOVEIT_LIB_NAME} PROPERTIES VERSION ${${PROJECT_NAME}_VERSION})

target_link_libraries(${MOVEIT_LIB_NAME} ${catkin_LIBRARIES} ${Boost_LIBRARIES})

Expand All @@ -20,6 +21,7 @@ if(CATKIN_ENABLE_TESTING)
endif()

add_library(collision_detector_hybrid_plugin src/collision_detector_hybrid_plugin_loader.cpp)
set_target_properties(collision_detector_hybrid_plugin PROPERTIES VERSION ${${PROJECT_NAME}_VERSION})
target_link_libraries(collision_detector_hybrid_plugin ${catkin_LIBRARIES} ${MOVEIT_LIB_NAME})

install(TARGETS ${MOVEIT_LIB_NAME} collision_detector_hybrid_plugin
Expand Down
Expand Up @@ -3,6 +3,7 @@ set(MOVEIT_LIB_NAME moveit_kinematics_cache)
add_library(${MOVEIT_LIB_NAME}
src/kinematics_cache.cpp
)
set_target_properties(${MOVEIT_LIB_NAME} PROPERTIES VERSION ${${PROJECT_NAME}_VERSION})
# This line is needed to ensure that messages are done being built before this is built
add_dependencies(${MOVEIT_LIB_NAME} moveit_msgs_gencpp)

Expand Down
@@ -1,6 +1,7 @@
set(MOVEIT_LIB_NAME moveit_kinematics_constraint_aware)

add_library(${MOVEIT_LIB_NAME} src/kinematics_constraint_aware.cpp)
set_target_properties(${MOVEIT_LIB_NAME} PROPERTIES VERSION ${${PROJECT_NAME}_VERSION})
# This line is needed to ensure that messages are done being built before this is built
add_dependencies(${MOVEIT_LIB_NAME} moveit_msgs_gencpp)

Expand Down
Expand Up @@ -35,4 +35,4 @@ install(
_ROBOT_NAME___GROUP_NAME__moveit_ikfast_plugin_description.xml
DESTINATION
${CATKIN_PACKAGE_SHARE_DESTINATION}
)
)
1 change: 1 addition & 0 deletions moveit_kinematics/kdl_kinematics_plugin/CMakeLists.txt
Expand Up @@ -3,6 +3,7 @@ set(MOVEIT_LIB_NAME moveit_kdl_kinematics_plugin)
add_library(${MOVEIT_LIB_NAME} src/kdl_kinematics_plugin.cpp
src/chainiksolver_pos_nr_jl_mimic.cpp
src/chainiksolver_vel_pinv_mimic.cpp)
set_target_properties(${MOVEIT_LIB_NAME} PROPERTIES VERSION ${${PROJECT_NAME}_VERSION})

target_link_libraries(${MOVEIT_LIB_NAME} moveit_rdf_loader ${catkin_LIBRARIES})

Expand Down
5 changes: 3 additions & 2 deletions moveit_kinematics/lma_kinematics_plugin/CMakeLists.txt
@@ -1,8 +1,9 @@
set(MOVEIT_LIB_NAME moveit_lma_kinematics_plugin)

add_library(${MOVEIT_LIB_NAME} src/lma_kinematics_plugin.cpp
src/chainiksolver_pos_lma_jl_mimic.cpp
add_library(${MOVEIT_LIB_NAME} src/lma_kinematics_plugin.cpp
src/chainiksolver_pos_lma_jl_mimic.cpp
src/chainiksolver_vel_pinv_mimic.cpp)
set_target_properties(${MOVEIT_LIB_NAME} PROPERTIES VERSION ${${PROJECT_NAME}_VERSION})

target_link_libraries(${MOVEIT_LIB_NAME} moveit_rdf_loader ${catkin_LIBRARIES})

Expand Down
1 change: 1 addition & 0 deletions moveit_kinematics/srv_kinematics_plugin/CMakeLists.txt
@@ -1,6 +1,7 @@
set(MOVEIT_LIB_NAME moveit_srv_kinematics_plugin)

add_library(${MOVEIT_LIB_NAME} src/srv_kinematics_plugin.cpp)
set_target_properties(${MOVEIT_LIB_NAME} PROPERTIES VERSION ${${PROJECT_NAME}_VERSION})

target_link_libraries(${MOVEIT_LIB_NAME} moveit_rdf_loader ${catkin_LIBRARIES})

Expand Down
4 changes: 3 additions & 1 deletion moveit_planners/chomp/chomp_interface/CMakeLists.txt
Expand Up @@ -33,10 +33,12 @@ include_directories(
${Boost_INCLUDE_DIRS} ${EIGEN3_INCLUDE_DIRS}
)

add_library(chomp_interface src/chomp_interface.cpp src/chomp_planning_context.cpp)
add_library(${PROJECT_NAME} src/chomp_interface.cpp src/chomp_planning_context.cpp)
set_target_properties(${PROJECT_NAME} PROPERTIES VERSION ${${PROJECT_NAME}_VERSION})
target_link_libraries(chomp_interface ${catkin_LIBRARIES})

add_library(chomp_planner_plugin src/chomp_plugin.cpp)
set_target_properties(chomp_planner_plugin PROPERTIES VERSION ${${PROJECT_NAME}_VERSION})
target_link_libraries(chomp_planner_plugin chomp_interface ${catkin_LIBRARIES})

install(FILES chomp_interface_plugin_description.xml
Expand Down
1 change: 1 addition & 0 deletions moveit_planners/chomp/chomp_motion_planner/CMakeLists.txt
Expand Up @@ -19,6 +19,7 @@ add_library(${PROJECT_NAME}
src/chomp_optimizer.cpp
src/chomp_planner.cpp
)
set_target_properties(${PROJECT_NAME} PROPERTIES VERSION ${${PROJECT_NAME}_VERSION})

target_link_libraries(${PROJECT_NAME} ${catkin_LIBRARIES})

Expand Down
2 changes: 2 additions & 0 deletions moveit_planners/ompl/ompl_interface/CMakeLists.txt
Expand Up @@ -20,6 +20,7 @@ add_library(${MOVEIT_LIB_NAME}
src/detail/constrained_goal_sampler.cpp
src/detail/ompl_console.cpp
)
set_target_properties(${MOVEIT_LIB_NAME} PROPERTIES VERSION ${${PROJECT_NAME}_VERSION})

find_package(OpenMP)

Expand All @@ -36,6 +37,7 @@ target_link_libraries(moveit_demo_construct_constraints_database ${MOVEIT_LIB_NA
set_target_properties(moveit_demo_construct_constraints_database PROPERTIES LINK_FLAGS "${OpenMP_CXX_FLAGS}")

add_library(moveit_ompl_planner_plugin src/ompl_planner_manager.cpp)
set_target_properties(moveit_ompl_planner_plugin PROPERTIES VERSION ${${PROJECT_NAME}_VERSION})
target_link_libraries(moveit_ompl_planner_plugin ${MOVEIT_LIB_NAME} ${catkin_LIBRARIES} ${Boost_LIBRARIES})

install(TARGETS ${MOVEIT_LIB_NAME} moveit_ompl_planner moveit_ompl_planner_plugin
Expand Down
Expand Up @@ -29,10 +29,11 @@ catkin_package(

include_directories(include)

add_library(moveit_controller_manager_example src/moveit_controller_manager_example.cpp)
target_link_libraries(moveit_controller_manager_example ${catkin_LIBRARIES} ${Boost_LIBRARIES})
add_library(${PROJECT_NAME} src/moveit_controller_manager_example.cpp)
set_target_properties(${PROJECT_NAME} PROPERTIES VERSION ${${PROJECT_NAME}_VERSION})
target_link_libraries(${PROJECT_NAME} ${catkin_LIBRARIES} ${Boost_LIBRARIES})

install(TARGETS moveit_controller_manager_example LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION})
install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION})

install(FILES moveit_controller_manager_example_plugin_description.xml
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
Expand Down
7 changes: 4 additions & 3 deletions moveit_plugins/moveit_fake_controller_manager/CMakeLists.txt
Expand Up @@ -31,12 +31,13 @@ catkin_package(

include_directories(include)

add_library(moveit_fake_controller_manager
add_library(${PROJECT_NAME}
src/moveit_fake_controller_manager.cpp
src/moveit_fake_controllers.cpp)
target_link_libraries(moveit_fake_controller_manager ${catkin_LIBRARIES} ${Boost_LIBRARIES})
set_target_properties(${PROJECT_NAME} PROPERTIES VERSION ${${PROJECT_NAME}_VERSION})
target_link_libraries(${PROJECT_NAME} ${catkin_LIBRARIES} ${Boost_LIBRARIES})

install(TARGETS moveit_fake_controller_manager LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION})
install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION})

install(FILES moveit_fake_controller_manager_plugin_description.xml
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
Expand Down
2 changes: 2 additions & 0 deletions moveit_plugins/moveit_ros_control_interface/CMakeLists.txt
Expand Up @@ -27,13 +27,15 @@ include_directories(include ${Boost_INCLUDE_DIRS} ${catkin_INCLUDE_DIRS})
add_library(${PROJECT_NAME}_plugin
src/controller_manager_plugin.cpp
)
set_target_properties(${PROJECT_NAME}_plugin PROPERTIES VERSION ${${PROJECT_NAME}_VERSION})
target_link_libraries(${PROJECT_NAME}_plugin
${catkin_LIBRARIES} ${Boost_LIBRARIES}
)

add_library(${PROJECT_NAME}_trajectory_plugin
src/joint_trajectory_controller_plugin.cpp
)
set_target_properties(${PROJECT_NAME}_trajectory_plugin PROPERTIES VERSION ${${PROJECT_NAME}_VERSION})
target_link_libraries(${PROJECT_NAME}_trajectory_plugin
${catkin_LIBRARIES} ${Boost_LIBRARIES}
)
Expand Down
Expand Up @@ -30,10 +30,11 @@ catkin_package(

include_directories(include)

add_library(moveit_simple_controller_manager src/moveit_simple_controller_manager.cpp)
target_link_libraries(moveit_simple_controller_manager ${catkin_LIBRARIES} ${Boost_LIBRARIES})
add_library(${PROJECT_NAME} src/moveit_simple_controller_manager.cpp)
set_target_properties(${PROJECT_NAME} PROPERTIES VERSION ${${PROJECT_NAME}_VERSION})
target_link_libraries(${PROJECT_NAME} ${catkin_LIBRARIES} ${Boost_LIBRARIES})

install(TARGETS moveit_simple_controller_manager LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION})
install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION})

install(FILES moveit_simple_controller_manager_plugin_description.xml
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
Expand Down
1 change: 1 addition & 0 deletions moveit_ros/benchmarks/CMakeLists.txt
Expand Up @@ -32,6 +32,7 @@ link_directories(${catkin_LIBRARY_DIRS})

add_library(${MOVEIT_LIB_NAME} src/BenchmarkOptions.cpp
src/BenchmarkExecutor.cpp)
set_target_properties(${MOVEIT_LIB_NAME} PROPERTIES VERSION ${${PROJECT_NAME}_VERSION})
target_link_libraries(${MOVEIT_LIB_NAME} ${catkin_LIBRARIES} ${Boost_LIBRARIES})

add_executable(moveit_run_benchmark src/RunBenchmark.cpp)
Expand Down
Expand Up @@ -5,6 +5,7 @@ include_directories(src)
add_library(${MOVEIT_LIB_NAME}
src/pick_place_action_capability.cpp
)
set_target_properties(${MOVEIT_LIB_NAME} PROPERTIES VERSION ${${PROJECT_NAME}_VERSION})

target_link_libraries(${MOVEIT_LIB_NAME} moveit_pick_place_planner ${catkin_LIBRARIES} ${Boost_LIBRARIES})

Expand Down
1 change: 1 addition & 0 deletions moveit_ros/manipulation/pick_place/CMakeLists.txt
Expand Up @@ -10,6 +10,7 @@ add_library(${MOVEIT_LIB_NAME}
src/pick.cpp
src/place.cpp
)
set_target_properties(${MOVEIT_LIB_NAME} PROPERTIES VERSION ${${PROJECT_NAME}_VERSION})

target_link_libraries(${MOVEIT_LIB_NAME} ${catkin_LIBRARIES} ${Boost_LIBRARIES})

Expand Down
2 changes: 2 additions & 0 deletions moveit_ros/move_group/CMakeLists.txt
Expand Up @@ -41,6 +41,7 @@ add_library(moveit_move_group_capabilities_base
src/move_group_context.cpp
src/move_group_capability.cpp
)
set_target_properties(moveit_move_group_capabilities_base PROPERTIES VERSION ${${PROJECT_NAME}_VERSION})
add_dependencies(moveit_move_group_capabilities_base ${catkin_EXPORTED_TARGETS}) # wait until all *_msgs packages are finished being built

add_executable(move_group src/move_group.cpp)
Expand All @@ -60,6 +61,7 @@ add_library(moveit_move_group_default_capabilities
src/default_capabilities/apply_planning_scene_service_capability.cpp
src/default_capabilities/clear_octomap_service_capability.cpp
)
set_target_properties(moveit_move_group_default_capabilities PROPERTIES VERSION ${${PROJECT_NAME}_VERSION})
add_dependencies(moveit_move_group_default_capabilities ${catkin_EXPORTED_TARGETS})

target_link_libraries(moveit_move_group_capabilities_base ${catkin_LIBRARIES} ${Boost_LIBRARIES})
Expand Down
@@ -1,11 +1,13 @@
set(MOVEIT_LIB_NAME moveit_depth_image_octomap_updater)

add_library(${MOVEIT_LIB_NAME}_core src/depth_image_octomap_updater.cpp)
set_target_properties(${MOVEIT_LIB_NAME}_core PROPERTIES VERSION ${${PROJECT_NAME}_VERSION})
target_link_libraries(${MOVEIT_LIB_NAME}_core moveit_lazy_free_space_updater moveit_mesh_filter moveit_occupancy_map_monitor ${catkin_LIBRARIES} ${Boost_LIBRARIES})

add_dependencies(${MOVEIT_LIB_NAME}_core ${sensor_msgs_EXPORTED_TARGETS})

add_library(${MOVEIT_LIB_NAME} src/updater_plugin.cpp)
set_target_properties(${MOVEIT_LIB_NAME} PROPERTIES VERSION ${${PROJECT_NAME}_VERSION})
target_link_libraries(${MOVEIT_LIB_NAME} ${MOVEIT_LIB_NAME}_core ${catkin_LIBRARIES} ${Boost_LIBRARIES})

install(TARGETS ${MOVEIT_LIB_NAME}_core ${MOVEIT_LIB_NAME} LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION})
Expand Down
@@ -1,6 +1,7 @@
set(MOVEIT_LIB_NAME moveit_lazy_free_space_updater)

add_library(${MOVEIT_LIB_NAME} src/lazy_free_space_updater.cpp)
set_target_properties(${MOVEIT_LIB_NAME} PROPERTIES VERSION ${${PROJECT_NAME}_VERSION})
set_target_properties(${MOVEIT_LIB_NAME} PROPERTIES COMPILE_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
set_target_properties(${MOVEIT_LIB_NAME} PROPERTIES LINK_FLAGS "${OpenMP_CXX_FLAGS}")
target_link_libraries(${MOVEIT_LIB_NAME} moveit_occupancy_map_monitor ${catkin_LIBRARIES} ${Boost_LIBRARIES})
Expand Down