new macro to replace add_node

ros2 · Jul 15, 2019 · 600565a · 600565a
1 parent b39d28e
commit 600565a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/...clcpp_components_add_multiple_nodes.cmake → ...p_components_add_library_with_nodes.cmake b/...clcpp_components_add_multiple_nodes.cmake → ...p_components_add_library_with_nodes.cmake
@@ -24,7 +24,7 @@
 # :param sourceN: the list of source files for executable and shared library
 # :type sourceN: list of strings
 #
-function(rclcpp_components_add_multiple_nodes target)
+function(rclcpp_components_add_library_with_nodes target)
   cmake_parse_arguments(
     ARGS
     "EXCLUDE_FROM_ALL"

diff --git a/rclcpp_components/cmake/rclcpp_components_register_node.cmake b/rclcpp_components/cmake/rclcpp_components_register_node.cmake
@@ -28,9 +28,14 @@
 # :type node: string
 #
 macro(rclcpp_components_register_node target)
-  set(ARGS ${ARGN})
-  list(GET ARGS 0 component)
-  list(GET ARGS 1 node)
+  cmake_parse_arguments(
+    ARGS
+    ""
+    "PLUGIN;EXECUTABLE"
+    ""
+    ${ARGN})
+  set(component ${ARGS_PLUGIN})
+  set(node ${ARGS_EXECUTABLE})
   _rclcpp_components_register_package_hook()
   if(WIN32)
     set(_path "bin")

diff --git a/rclcpp_components/rclcpp_components-extras.cmake b/rclcpp_components/rclcpp_components-extras.cmake
@@ -29,3 +29,4 @@ include("${rclcpp_components_DIR}/rclcpp_components_register_nodes.cmake")
 include("${rclcpp_components_DIR}/rclcpp_components_add_node.cmake")
 include("${rclcpp_components_DIR}/rclcpp_components_add_multiple_nodes.cmake")
 include("${rclcpp_components_DIR}/rclcpp_components_register_node.cmake")
+include("${rclcpp_components_DIR}/rclcpp_components_add_library_with_nodes.cmake")