niklas/rcl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[rcl_action] Clean up CMakeLists.txt

Browse source
This commit is contained in:
Jacob Perron 2018-11-20 15:16:10 -08:00
parent ce8ac5eeec
commit f39ac3cbe7
1 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
rcl_action/CMakeLists.txt
View file

@ -53,11 +53,11 @@ add_library(${PROJECT_NAME}
) )
ament_target_dependencies(${PROJECT_NAME} ament_target_dependencies(${PROJECT_NAME}
"rosidl_generator_c"
"action_msgs" "action_msgs"
"rmw"
"rcutils"
"rcl" "rcl"
"rcutils"
"rmw"
"rosidl_generator_c"
) )
# Causes the visibility macros to use dllexport rather than dllimport, # Causes the visibility macros to use dllexport rather than dllimport,
# which is appropriate when building the dll but not consuming it. # which is appropriate when building the dll but not consuming it.
@ -75,7 +75,6 @@ install(TARGETS ${PROJECT_NAME}
) )
if(BUILD_TESTING) if(BUILD_TESTING)
find_package(test_msgs REQUIRED)
find_package(ament_cmake_gtest REQUIRED) find_package(ament_cmake_gtest REQUIRED)
find_package(ament_lint_auto REQUIRED) find_package(ament_lint_auto REQUIRED)
find_package(test_msgs REQUIRED) find_package(test_msgs REQUIRED)
@ -101,7 +100,6 @@ if(BUILD_TESTING)
target_include_directories(test_action_communication PUBLIC target_include_directories(test_action_communication PUBLIC
include include
${rcl_INCLUDE_DIRS} ${rcl_INCLUDE_DIRS}
${test_msgs_INCLUDE_DIRS}
) )
target_link_libraries(test_action_communication target_link_libraries(test_action_communication
${PROJECT_NAME} ${PROJECT_NAME}
@ -115,7 +113,6 @@ if(BUILD_TESTING)
target_include_directories(test_action_server PUBLIC target_include_directories(test_action_server PUBLIC
include include
${rcl_INCLUDE_DIRS} ${rcl_INCLUDE_DIRS}
${test_msgs_INCLUDE_DIRS}
) )
target_link_libraries(test_action_server target_link_libraries(test_action_server
${PROJECT_NAME} ${PROJECT_NAME}