From ea44f6fa4623a605ac84c4d6baee8532cd0aa666 Mon Sep 17 00:00:00 2001 From: William Woodall Date: Tue, 31 Mar 2015 11:39:39 -0700 Subject: [PATCH] removing rmw_implementation --- rmw_implementation/CMakeLists.txt | 19 --------- .../get_available_rmw_implementations.cmake | 10 ----- .../get_default_rmw_implementation.cmake | 42 ------------------- rmw_implementation/package.xml | 18 -------- .../rmw_implementation-extras.cmake | 12 ------ 5 files changed, 101 deletions(-) delete mode 100644 rmw_implementation/CMakeLists.txt delete mode 100644 rmw_implementation/cmake/get_available_rmw_implementations.cmake delete mode 100644 rmw_implementation/cmake/get_default_rmw_implementation.cmake delete mode 100644 rmw_implementation/package.xml delete mode 100644 rmw_implementation/rmw_implementation-extras.cmake diff --git a/rmw_implementation/CMakeLists.txt b/rmw_implementation/CMakeLists.txt deleted file mode 100644 index 208fa372..00000000 --- a/rmw_implementation/CMakeLists.txt +++ /dev/null @@ -1,19 +0,0 @@ -cmake_minimum_required(VERSION 2.8.3) - -project(rmw_implementation NONE) - -find_package(ament_cmake REQUIRED) - -if(AMENT_ENABLE_TESTING) - find_package(ament_lint_auto REQUIRED) - ament_lint_auto_find_test_dependencies() -endif() - -ament_package( - CONFIG_EXTRAS "rmw_implementation-extras.cmake" -) - -install( - DIRECTORY cmake - DESTINATION share/${PROJECT_NAME} -) diff --git a/rmw_implementation/cmake/get_available_rmw_implementations.cmake b/rmw_implementation/cmake/get_available_rmw_implementations.cmake deleted file mode 100644 index 71ddf63a..00000000 --- a/rmw_implementation/cmake/get_available_rmw_implementations.cmake +++ /dev/null @@ -1,10 +0,0 @@ -# -# Get the package names of the available ROS middleware implemenations. -# -# :param var: the output variable name containing the package names -# :type var: list of strings -# -function(get_available_rmw_implementations var) - ament_index_get_resources(middleware_implementations "rmw_implementation") - set(${var} ${middleware_implementations} PARENT_SCOPE) -endfunction() diff --git a/rmw_implementation/cmake/get_default_rmw_implementation.cmake b/rmw_implementation/cmake/get_default_rmw_implementation.cmake deleted file mode 100644 index 7391f625..00000000 --- a/rmw_implementation/cmake/get_default_rmw_implementation.cmake +++ /dev/null @@ -1,42 +0,0 @@ -# -# Get the package name of the default ROS middleware implemenation. -# -# Either selcting it using the variable ROS_MIDDLEWARE_IMPLEMENTATION or -# choosing a default from the available implementations. -# -# :param var: the output variable name containing the package name -# :type var: string -# -function(get_default_rmw_implementation var) - get_available_rmw_implementations(middleware_implementations) - - if("${middleware_implementations} " STREQUAL " ") - message(FATAL_ERROR "Could not find any ROS middleware implementation.") - endif() - - # option() - if(NOT "${ROS_MIDDLEWARE_IMPLEMENTATION} " STREQUAL " ") - set(middleware_implementation "${ROS_MIDDLEWARE_IMPLEMENTATION}") - elseif(NOT "$ENV{ROS_MIDDLEWARE_IMPLEMENTATION} " STREQUAL " ") - set(middleware_implementation "$ENV{ROS_MIDDLEWARE_IMPLEMENTATION}") - else() - # TODO detemine "default" implementation based on the available ones - list(GET middleware_implementations 0 middleware_implementation) - endif() - - # verify that the selection one is available - list(FIND middleware_implementations "${middleware_implementation}" _index) - if(_index EQUAL -1) - string(REPLACE ";" ", " middleware_implementations_string "${middleware_implementations}") - message(FATAL_ERROR "Could not find ROS middleware implementation '${middleware_implementation}'. Choose one of the following: ${middleware_implementations_string}") - endif() - find_package("${middleware_implementation}" REQUIRED) - - # persist implementation decision in cache - set( - ROS_MIDDLEWARE_IMPLEMENTATION "${middleware_implementation}" - CACHE STRING "Select ROS middleware implementation to link against" FORCE - ) - - set(${var} ${middleware_implementation} PARENT_SCOPE) -endfunction() diff --git a/rmw_implementation/package.xml b/rmw_implementation/package.xml deleted file mode 100644 index cedab756..00000000 --- a/rmw_implementation/package.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - rmw_implementation - 0.0.0 - The decision which ROS middleware implementation should be used for C++. - Dirk Thomas - Apache License 2.0 - - ament_cmake - ament_cmake - - rmw_connext_cpp - rmw_connext_xtypes_dynamic_cpp - rmw_opensplice_cpp - - ament_lint_auto - ament_lint_common - diff --git a/rmw_implementation/rmw_implementation-extras.cmake b/rmw_implementation/rmw_implementation-extras.cmake deleted file mode 100644 index 51325889..00000000 --- a/rmw_implementation/rmw_implementation-extras.cmake +++ /dev/null @@ -1,12 +0,0 @@ -# copied from rmw_implementation/rmw_implementation-extras.cmake - -include("${rmw_implementation_DIR}/get_available_rmw_implementations.cmake") -include("${rmw_implementation_DIR}/get_default_rmw_implementation.cmake") - -get_default_rmw_implementation(_middleware_implementation) -find_package("${_middleware_implementation}" REQUIRED) - -# TODO should never need definitions and include dirs? -list(APPEND rmw_implementation_DEFINITIONS ${${_middleware_implementation}_DEFINITIONS}) -list(APPEND rmw_implementation_INCLUDE_DIRS ${${_middleware_implementation}_INCLUDE_DIRS}) -list(APPEND rmw_implementation_LIBRARIES ${${_middleware_implementation}_LIBRARIES})