From ec71e6562ecac9225df8869e84a3f46db7ca9074 Mon Sep 17 00:00:00 2001 From: Dirk Thomas Date: Mon, 7 Nov 2016 10:55:17 -0800 Subject: [PATCH] move CMake function into separate file --- rclcpp/cmake/rclcpp_create_node_main.cmake | 28 ++++++++++++++++++++++ rclcpp/rclcpp-extras.cmake | 13 +--------- 2 files changed, 29 insertions(+), 12 deletions(-) create mode 100644 rclcpp/cmake/rclcpp_create_node_main.cmake diff --git a/rclcpp/cmake/rclcpp_create_node_main.cmake b/rclcpp/cmake/rclcpp_create_node_main.cmake new file mode 100644 index 0000000..3d77516 --- /dev/null +++ b/rclcpp/cmake/rclcpp_create_node_main.cmake @@ -0,0 +1,28 @@ +# Copyright 2015 Open Source Robotics Foundation, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# copied from rclcpp/rclcpp-extras.cmake + + +set(rclcpp_node_main_SRC "${rclcpp_DIR}/../../../src/rclcpp/node_main.cpp") + +function(rclcpp_create_node_main node_library_target) + if(NOT TARGET ${node_library_target}) + message(FATAL_ERROR "rclcpp_create_node_main() the first argument must be a valid target name") + endif() + set(executable_name_ ${node_library_target}_node) + add_executable(${executable_name_} ${rclcpp_node_main_SRC}) + target_link_libraries(${executable_name_} ${node_library_target}) + install(TARGETS ${executable_name_} DESTINATION bin) +endfunction() diff --git a/rclcpp/rclcpp-extras.cmake b/rclcpp/rclcpp-extras.cmake index 7ecfec8..e237b62 100644 --- a/rclcpp/rclcpp-extras.cmake +++ b/rclcpp/rclcpp-extras.cmake @@ -15,15 +15,4 @@ # copied from rclcpp/rclcpp-extras.cmake include("${rclcpp_DIR}/get_rclcpp_information.cmake") - -set(rclcpp_node_main_SRC "${rclcpp_DIR}/../../../src/rclcpp/node_main.cpp") - -function(rclcpp_create_node_main node_library_target) - if(NOT TARGET ${node_library_target}) - message(FATAL_ERROR "rclcpp_create_node_main() the first argument must be a valid target name") - endif() - set(executable_name_ ${node_library_target}_node) - add_executable(${executable_name_} ${rclcpp_node_main_SRC}) - target_link_libraries(${executable_name_} ${node_library_target}) - install(TARGETS ${executable_name_} DESTINATION bin) -endfunction() +include("${rclcpp_DIR}/rclcpp_create_node_main.cmake")