Using ament_target_dependencies where possible

Signed-off-by: ivanpauno <ivanpauno@ekumenlabs.com>
ros2 · Mar 15, 2019 · e3871f4 · e3871f4
1 parent 1d8b831
commit e3871f4
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 22 deletions.
diff --git a/rcl_action/CMakeLists.txt b/rcl_action/CMakeLists.txt
@@ -87,12 +87,11 @@ if(BUILD_TESTING)
   if(TARGET test_action_client)
     target_include_directories(test_action_client PUBLIC
       include
-      ${osrf_testing_tools_cpp_INCLUDE_DIRS}
     )
     target_link_libraries(test_action_client
       ${PROJECT_NAME}
     )
-    ament_target_dependencies(test_action_client "rcl" "test_msgs")
+    ament_target_dependencies(test_action_client "osrf_testing_tools_cpp" "rcl" "test_msgs")
   endif()
 
   # get the rmw implementations ahead of time
@@ -118,13 +117,14 @@ if(BUILD_TESTING)
         PUBLIC "RMW_IMPLEMENTATION=${rmw_implementation}")
       target_include_directories(${target}${target_suffix} PUBLIC
         include
-        ${rcl_INCLUDE_DIRS}
       )
       target_link_libraries(${target}${target_suffix}
         ${PROJECT_NAME}
       )
       ament_target_dependencies(${target}${target_suffix}
-        "test_msgs")
+        "rcl"
+        "test_msgs"
+      )
     endif()
   endfunction()
 
@@ -156,58 +156,56 @@ if(BUILD_TESTING)
   if(TARGET test_action_server)
     target_include_directories(test_action_server PUBLIC
       include
-      ${rcl_INCLUDE_DIRS}
     )
     target_link_libraries(test_action_server
       ${PROJECT_NAME}
     )
-    ament_target_dependencies(test_action_server "test_msgs")
+    ament_target_dependencies(test_action_server
+      "rcl"
+      "test_msgs"
+    )
   endif()
   ament_add_gtest(test_goal_handle
     test/rcl_action/test_goal_handle.cpp
   )
   if(TARGET test_goal_handle)
     target_include_directories(test_goal_handle PUBLIC
       include
-      ${rcl_INCLUDE_DIRS}
     )
     target_link_libraries(test_goal_handle
       ${PROJECT_NAME}
     )
+    ament_target_dependencies(test_action_server "rcl")
   endif()
   ament_add_gtest(test_goal_state_machine
     test/rcl_action/test_goal_state_machine.cpp
   )
   if(TARGET test_goal_state_machine)
-    target_include_directories(test_goal_state_machine PUBLIC
-      ${rcl_INCLUDE_DIRS}
-    )
     target_link_libraries(test_goal_state_machine
       ${PROJECT_NAME}
     )
+    ament_target_dependencies(test_action_server "rcl")
   endif()
   ament_add_gtest(test_types
     test/rcl_action/test_types.cpp
   )
   if(TARGET test_types)
     target_include_directories(test_types PUBLIC
       include
-      ${rcl_INCLUDE_DIRS}
     )
     target_link_libraries(test_types
       ${PROJECT_NAME}
     )
+    ament_target_dependencies(test_action_server "rcl")
   endif()
   ament_add_gtest(test_names
     test/rcl_action/test_names.cpp
   )
   if(TARGET test_names)
-    target_include_directories(test_names PUBLIC
-      ${rcl_INCLUDE_DIRS}
-    )
     target_link_libraries(test_names
       ${PROJECT_NAME}
     )
+    ament_target_dependencies(test_action_server "rcl")
   endif()
 endif()
 

diff --git a/rcl_lifecycle/CMakeLists.txt b/rcl_lifecycle/CMakeLists.txt
@@ -70,28 +70,28 @@ 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()
   ament_add_gtest(test_multiple_instances
     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()
   ament_add_gtest(test_transition_map
     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()