Skip to content

Commit

Permalink
Revert "Add action server implementation (ros2#323)"
Browse files Browse the repository at this point in the history
This reverts commit cd89209.
  • Loading branch information
nburek committed Nov 26, 2018
1 parent 6013e07 commit 1306214
Show file tree
Hide file tree
Showing 11 changed files with 94 additions and 1,879 deletions.
41 changes: 1 addition & 40 deletions rcl_action/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,8 @@ project(rcl_action)

find_package(ament_cmake_ros REQUIRED)

find_package(rosidl_generator_c REQUIRED)
find_package(action_msgs REQUIRED)
find_package(rcl REQUIRED)
find_package(rcutils REQUIRED)
find_package(rmw REQUIRED)

include_directories(
include
Expand Down Expand Up @@ -36,7 +33,6 @@ add_executable(test_compile_headers

set(rcl_action_sources
src/${PROJECT_NAME}/action_client.c
src/${PROJECT_NAME}/action_server.c
src/${PROJECT_NAME}/goal_handle.c
src/${PROJECT_NAME}/goal_state_machine.c
src/${PROJECT_NAME}/names.c
Expand All @@ -53,11 +49,8 @@ add_library(${PROJECT_NAME}
)

ament_target_dependencies(${PROJECT_NAME}
"rosidl_generator_c"
"action_msgs"
"rmw"
"rcutils"
"rcl"
"action_msgs"
)
# Causes the visibility macros to use dllexport rather than dllimport,
# which is appropriate when building the dll but not consuming it.
Expand All @@ -75,7 +68,6 @@ install(TARGETS ${PROJECT_NAME}
)

if(BUILD_TESTING)
find_package(test_msgs REQUIRED)
find_package(ament_cmake_gtest REQUIRED)
find_package(ament_lint_auto REQUIRED)
find_package(test_msgs REQUIRED)
Expand All @@ -94,34 +86,6 @@ if(BUILD_TESTING)
)
ament_target_dependencies(test_action_client "rcl" "test_msgs")
endif()
ament_add_gtest(test_action_communication
test/rcl_action/test_action_communication.cpp
)
if(TARGET test_action_communication)
target_include_directories(test_action_communication PUBLIC
include
${rcl_INCLUDE_DIRS}
${test_msgs_INCLUDE_DIRS}
)
target_link_libraries(test_action_communication
${PROJECT_NAME}
)
ament_target_dependencies(test_action_communication "test_msgs")
endif()
ament_add_gtest(test_action_server
test/rcl_action/test_action_server.cpp
)
if(TARGET test_action_server)
target_include_directories(test_action_server PUBLIC
include
${rcl_INCLUDE_DIRS}
${test_msgs_INCLUDE_DIRS}
)
target_link_libraries(test_action_server
${PROJECT_NAME}
)
ament_target_dependencies(test_action_server "test_msgs")
endif()
ament_add_gtest(test_goal_handle
test/rcl_action/test_goal_handle.cpp
)
Expand Down Expand Up @@ -175,8 +139,5 @@ ament_export_include_directories(include)
ament_export_libraries(${PROJECT_NAME})
ament_export_dependencies(ament_cmake)
ament_export_dependencies(rcl)
ament_export_dependencies(rcutils)
ament_export_dependencies(rmw)
ament_export_dependencies(action_msgs)
ament_export_dependencies(rosidl_generator_c)
ament_package()
Loading

0 comments on commit 1306214

Please sign in to comment.