Skip to content

Commit

Permalink
Restored API compatibility
Browse files Browse the repository at this point in the history
  • Loading branch information
melvinisken committed Feb 2, 2016
1 parent 485d631 commit 734f29a
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 20 deletions.
21 changes: 16 additions & 5 deletions robotino_local_move/CMakeLists.txt
Expand Up @@ -13,6 +13,7 @@ find_package(catkin REQUIRED COMPONENTS
robotino_msgs
std_msgs
tf
message_generation
)

## System dependencies are found with CMake's conventions
Expand Down Expand Up @@ -56,11 +57,10 @@ find_package(catkin REQUIRED COMPONENTS
# )

## Generate services in the 'srv' folder
# add_service_files(
# FILES
# Service1.srv
# Service2.srv
# )
add_service_files(
FILES
MoveRobotino.srv
)

## Generate actions in the 'action' folder
add_action_files(
Expand Down Expand Up @@ -110,6 +110,17 @@ include_directories(

## Declare a cpp executable
# add_executable(robotino_local_move_node src/robotino_local_move_node.cpp)

add_executable(
robotino_local_move_service_node
src/robotino_local_move_service_node.cpp
src/RobotinoLocalMoveClient.cpp)

target_link_libraries(robotino_local_move_service_node
${catkin_LIBRARIES}
)
add_dependencies(robotino_local_move_service_node robotino_local_move_gencpp)

add_executable(
robotino_local_move_server_node
src/robotino_local_move_server_node.cpp
Expand Down
30 changes: 15 additions & 15 deletions robotino_node/CMakeLists.txt
Expand Up @@ -186,21 +186,21 @@ target_link_libraries(
${catkin_LIBRARIES}
)

add_executable(
robotino_mapping_node
src/robotino_mapping_node.cpp
src/MappingROS.cpp
src/RobotinoMappingNode.cpp
src/InitialPoseROS.cpp
src/NavGoalROS.cpp
src/ComROS.cpp
)

target_link_libraries(
robotino_mapping_node
${REC_ROBOTINO_API2_LIBRARY}
${catkin_LIBRARIES}
)
#add_executable(
# robotino_mapping_node
# src/robotino_mapping_node.cpp
# src/MappingROS.cpp
# src/RobotinoMappingNode.cpp
# src/InitialPoseROS.cpp
# src/NavGoalROS.cpp
# src/ComROS.cpp
#)

#target_link_libraries(
# robotino_mapping_node
# ${REC_ROBOTINO_API2_LIBRARY}
# ${catkin_LIBRARIES}
#)

## Add cmake target dependencies of the executable/library
## as an example, message headers may need to be generated before nodes
Expand Down

0 comments on commit 734f29a

Please sign in to comment.