Update Connext license filter resource name to specify it's a prefix (#…

…242) * Update the Connext license filter to be a regex * typo * Switch back to prefix for efficiency * Clarify we're registering a prefix not pattern Both are supported by launch_testing now
ros2 · Sep 28, 2017 · a121377 · a121377
1 parent fc070b4
commit a121377
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/rmw_connext_cpp/CMakeLists.txt b/rmw_connext_cpp/CMakeLists.txt
@@ -139,4 +139,4 @@ install(
 )
 
 get_rmw_connext_output_filter("rmw_connext_output_filter")
-ament_index_register_resource("rmw_output_filter" CONTENT "${rmw_connext_output_filter}")
+ament_index_register_resource("rmw_output_prefixes" CONTENT "${rmw_connext_output_filter}")
diff --git a/rmw_connext_dynamic_cpp/CMakeLists.txt b/rmw_connext_dynamic_cpp/CMakeLists.txt
@@ -104,4 +104,4 @@ install(
 )
 
 get_rmw_connext_output_filter("rmw_connext_output_filter")
-ament_index_register_resource("rmw_output_filter" CONTENT "${rmw_connext_output_filter}")
+ament_index_register_resource("rmw_output_prefixes" CONTENT "${rmw_connext_output_filter}")
diff --git a/rmw_connext_shared_cpp/cmake/get_rmw_connext_output_filter.cmake b/rmw_connext_shared_cpp/cmake/get_rmw_connext_output_filter.cmake
@@ -15,8 +15,9 @@
 #
 # Get the output filter for the Connext RMW packages.
 #
-# :param output_filter: the filter which will be used to identify console
-#   output generated by Connext
+# :param output_filter: the filter that will be used to identify console
+#   output generated by Connext. This is provided as a single string with each
+#   line of the string containing a filter that will be checked independently.
 # :type output_filter: string
 #
 # @public