reshuffle depends

gerkey · gerkey · commit da226ac7aec9 · 2017-03-10T15:02:24.000-08:00
diff --git a/test_communication/CMakeLists.txt b/test_communication/CMakeLists.txt
@@ -14,13 +14,6 @@ find_package(ament_cmake REQUIRED)
 find_package(ament_cmake_auto REQUIRED)
 ament_auto_find_build_dependencies()
 
-# get the rmw implementations ahead of time
-find_package(rmw_implementation_cmake REQUIRED)
-get_available_rmw_implementations(rmw_implementations2)
-foreach(rmw_implementation ${rmw_implementations2})
-  find_package("${rmw_implementation}" REQUIRED)
-endforeach()
-
 set(message_files
   "msg/BoundedArrayNested.msg"
   "msg/BoundedArrayPrimitives.msg"
@@ -52,6 +45,13 @@ if(BUILD_TESTING)
   find_package(ament_lint_auto REQUIRED)
   ament_lint_auto_find_test_dependencies()
 
+  # get the rmw implementations ahead of time
+  find_package(rmw_implementation_cmake REQUIRED)
+  get_available_rmw_implementations(rmw_implementations2)
+  foreach(rmw_implementation ${rmw_implementations2})
+    find_package("${rmw_implementation}" REQUIRED)
+  endforeach()
+
   function(custom_test target with_message_argument)
     if(with_message_argument)
       # adding test for each message type
diff --git a/test_communication/package.xml b/test_communication/package.xml
@@ -13,12 +13,12 @@
 
   <build_depend>ament_cmake_auto</build_depend>
   <build_depend>builtin_interfaces</build_depend>
-  <build_depend>rmw_implementation</build_depend>
-  <build_depend>rmw_implementation_cmake</build_depend>
   <build_depend>rosidl_default_generators</build_depend>
 
   <buildtool_depend>ament_cmake</buildtool_depend>
 
+  <exec_depend>rosidl_default_runtime</exec_depend>
+
   <test_depend>ament_cmake_nose</test_depend>
   <test_depend>ament_cmake_gtest</test_depend>
   <test_depend>ament_lint_auto</test_depend>
@@ -27,8 +27,8 @@
   <test_depend>rclcpp</test_depend>
   <test_depend>rclpy</test_depend>
   <test_depend>rcl</test_depend>
-
-  <exec_depend>rosidl_default_runtime</exec_depend>
+  <test_depend>rmw_implementation</test_depend>
+  <test_depend>rmw_implementation_cmake</test_depend>
 
   <export>
     <build_type>ament_cmake</build_type>
