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

Using ament_target_dependencies where possible (#400)

Browse source 
* Using ament_target_dependencies where possible

Signed-off-by: ivanpauno <ivanpauno@ekumenlabs.com>

* Modified rcl_add_custom_* to use AMENT_DEPENDENCIES where possible

Signed-off-by: ivanpauno <ivanpauno@ekumenlabs.com>

* Added again osrf_testing_tools_cpp::memory_tools library where needed.

Signed-off-by: ivanpauno <ivanpauno@ekumenlabs.com>

* Modified with PR comment, and replaced forgotten osrf_testing_tools_cpp including

Signed-off-by: ivanpauno <ivanpauno@ekumenlabs.com>
This commit is contained in:
ivanpauno 2019-03-19 09:22:16 -03:00 • committed by GitHub
parent 29b0838388
commit 99630cb66d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 38 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

16
rcl_lifecycle/CMakeLists.txt
View file

@ -70,9 +70,9 @@ if(BUILD_TESTING)
test/test_default_state_machine.cpp
)
if(TARGET test_default_state_machine)
target_include_directories(test_default_state_machine PUBLIC
${rcl_INCLUDE_DIRS}
${osrf_testing_tools_cpp_INCLUDE_DIRS}
ament_target_dependencies(test_default_state_machine
"rcl"
"osrf_testing_tools_cpp"
)
target_link_libraries(test_default_state_machine ${PROJECT_NAME})
endif()
@ -80,9 +80,9 @@ if(BUILD_TESTING)
test/test_multiple_instances.cpp
)
if(TARGET test_multiple_instances)
target_include_directories(test_multiple_instances PUBLIC
${rcl_INCLUDE_DIRS}
${osrf_testing_tools_cpp_INCLUDE_DIRS}
ament_target_dependencies(test_multiple_instances
"rcl"
"osrf_testing_tools_cpp"
)
target_link_libraries(test_multiple_instances ${PROJECT_NAME})
endif()
@ -90,8 +90,8 @@ if(BUILD_TESTING)
test/test_transition_map.cpp
)
if(TARGET test_transition_map)
target_include_directories(test_transition_map PUBLIC
${rcl_INCLUDE_DIRS}
ament_target_dependencies(test_transition_map
"rcl"
)
target_link_libraries(test_transition_map ${PROJECT_NAME})
endif()