diff --git a/micro_ros_agent/CMakeLists.txt b/micro_ros_agent/CMakeLists.txt index 0ccd019..3195855 100644 --- a/micro_ros_agent/CMakeLists.txt +++ b/micro_ros_agent/CMakeLists.txt @@ -208,8 +208,7 @@ file(WRITE "${_DEFAULT_FASTRTPS_PROFILES_PATH}" "${_XmlDoc}") # Only compile uROS agent if rclcpp is found find_package(rclcpp QUIET) if (rclcpp_FOUND) - find_package(microxrcedds_agent_cmake_module REQUIRED) - find_package(MicroXRCEDDS_Agent REQUIRED MODULE) + find_package(microxrcedds_agent REQUIRED) add_executable(${PROJECT_NAME} src/main.cpp) ament_target_dependencies( diff --git a/micro_ros_agent/package.xml b/micro_ros_agent/package.xml index 2eb1af6..2b51636 100644 --- a/micro_ros_agent/package.xml +++ b/micro_ros_agent/package.xml @@ -14,7 +14,7 @@ fastcdr fastrtps - microxrcedds_agent_cmake_module + microxrcedds_agent rosidl_cmake rclcpp diff --git a/microxrcedds_agent_cmake_module/CHANGELOG.rst b/microxrcedds_agent_cmake_module/CHANGELOG.rst deleted file mode 100644 index 98d3f44..0000000 --- a/microxrcedds_agent_cmake_module/CHANGELOG.rst +++ /dev/null @@ -1,7 +0,0 @@ -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Changelog for package microxrcedds_agent_cmake_module -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - -0.0.1 (2019-04-24) ------------------- -* Initial release diff --git a/microxrcedds_agent_cmake_module/CMakeLists.txt b/microxrcedds_agent_cmake_module/CMakeLists.txt deleted file mode 100644 index 8a4f2eb..0000000 --- a/microxrcedds_agent_cmake_module/CMakeLists.txt +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 2018 Proyectos y Sistemas de Mantenimiento SL (eProsima). -# -# 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. - -cmake_minimum_required(VERSION 3.5) - -project(microxrcedds_agent_cmake_module) - -find_package(ament_cmake REQUIRED) - -if(BUILD_TESTING) - find_package(ament_lint_auto REQUIRED) - ament_lint_auto_find_test_dependencies() -endif() - -ament_package( - CONFIG_EXTRAS "microxrcedds_agent_cmake_module-extras.cmake" -) - -install(DIRECTORY cmake - DESTINATION share/${PROJECT_NAME} -) diff --git a/microxrcedds_agent_cmake_module/cmake/Modules/FindMicroXRCEDDS_Agent.cmake b/microxrcedds_agent_cmake_module/cmake/Modules/FindMicroXRCEDDS_Agent.cmake deleted file mode 100644 index 3c69f70..0000000 --- a/microxrcedds_agent_cmake_module/cmake/Modules/FindMicroXRCEDDS_Agent.cmake +++ /dev/null @@ -1,124 +0,0 @@ -# Copyright 2018 Proyectos y Sistemas de Mantenimiento SL (eProsima). -# -# 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. - -############################################################################### -# -# CMake module for finding eProsima MICROXRCEDDS_AGENT. -# -# Output variables: -# -# - MicroXRCEDDS_Agent_FOUND: flag indicating if the package was found -# - MicroXRCEDDS_Agent_INCLUDE_DIR: Paths to the header files -# -# Example usage: -# -# find_package(uros_agent_cmake_module REQUIRED) -# find_package(MicroXRCEDDS_Agent MODULE) -# # use MicroXRCEDDS_Agent_* variables -# -############################################################################### - -# lint_cmake: -convention/filename, -package/stdargs - -set(MicroXRCEDDS_Agent_FOUND FALSE) - -find_package(microxrcedds_agent REQUIRED CONFIG) -find_package(fastcdr REQUIRED CONFIG) -find_package(fastrtps REQUIRED CONFIG) - -find_path(MicroXRCEDDS_Agent_INCLUDE_DIR NAMES uxr) - -string(REGEX MATCH "^[0-9]+\\.[0-9]+" microxrcedds_agent_MAJOR_MINOR_VERSION "${microxrcedds_agent_VERSION}") -string(REGEX MATCH "^[0-9]+\\.[0-9]+" fastcdr_MAJOR_MINOR_VERSION "${fastcdr_VERSION}") -string(REGEX MATCH "^[0-9]+\\.[0-9]+" fastrtps_MAJOR_MINOR_VERSION "${fastrtps_VERSION}") - -## -find_library(MicroXRCEDDS_Agent_LIBRARY_RELEASE - NAMES microxrcedds_agent-${microxrcedds_agent_MAJOR_MINOR_VERSION} microxrcedds_agent) - -find_library(MicroXRCEDDS_Agent_LIBRARY_DEBUG - NAMES microxrcedds_agentd-${microxrcedds_agent_MAJOR_MINOR_VERSION} microxrcedds_agentd) - -if(MicroXRCEDDS_Agent_LIBRARY_RELEASE AND MicroXRCEDDS_Agent_LIBRARY_DEBUG) - set(MicroXRCEDDS_Agent_LIBRARIES - optimized ${MicroXRCEDDS_Agent_LIBRARY_RELEASE} - debug ${MicroXRCEDDS_Agent_LIBRARY_DEBUG} - ) -elseif(MicroXRCEDDS_Agent_LIBRARY_RELEASE) - set(MicroXRCEDDS_Agent_LIBRARIES - ${MicroXRCEDDS_Agent_LIBRARY_RELEASE} - ) -elseif(MicroXRCEDDS_Agent_LIBRARY_DEBUG) - set(MicroXRCEDDS_Agent_LIBRARIES - ${MicroXRCEDDS_Agent_LIBRARY_DEBUG} - ) -else() - set(MicroXRCEDDS_Agent_LIBRARIES "") -endif() - -## -find_library(FastRTPS_LIBRARY_RELEASE - NAMES fastrtps-${fastrtps_MAJOR_MINOR_VERSION} fastrtps) - -find_library(FastRTPS_LIBRARY_DEBUG - NAMES fastrtpsd-${fastrtps_MAJOR_MINOR_VERSION} fastrtpsd) - -if(FastRTPS_LIBRARY_RELEASE AND FastRTPS_LIBRARY_DEBUG) - set(FastRTPS_LIBRARIES - optimized ${FastRTPS_LIBRARY_RELEASE} - debug ${FastRTPS_LIBRARY_DEBUG} - ) -elseif(FastRTPS_LIBRARY_RELEASE) - set(FastRTPS_LIBRARIES - ${MicroXRCEDDS_Agent_LIBRARY_RELEASE} - ) -elseif(FastRTPS_LIBRARY_DEBUG) - set(FastRTPS_LIBRARIES - ${MicroXRCEDDS_Agent_LIBRARY_DEBUG} - ) -else() - set(FastRTPS_LIBRARIES "") -endif() - -## -find_library(FastCDR_LIBRARY_RELEASE - NAMES fastcdr-${fastcdr_MAJOR_MINOR_VERSION} fastcdr) - -find_library(FastCDR_LIBRARY_DEBUG - NAMES fastcdrd-${fastcdr_MAJOR_MINOR_VERSION} fastcdrd) - -if(FastCDR_LIBRARY_RELEASE AND FastCDR_LIBRARY_DEBUG) - set(FastCDR_LIBRARIES - optimized ${FastCDR_LIBRARY_RELEASE} - debug ${FastCDR_LIBRARY_DEBUG} - ) -elseif(FastCDR_LIBRARY_RELEASE) - set(FastCDR_LIBRARIES - ${FastCDR_LIBRARY_RELEASE} - ) -elseif(FastCDR_LIBRARY_DEBUG) - set(FastCDR_LIBRARIES - ${FastCDR_LIBRARY_DEBUG} - ) -else() - set(FastCDR_LIBRARIES "") -endif() - -include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(MicroXRCEDDS_Agent - FOUND_VAR MicroXRCEDDS_Agent_FOUND - REQUIRED_VARS - MicroXRCEDDS_Agent_INCLUDE_DIR - MicroXRCEDDS_Agent_LIBRARIES -) \ No newline at end of file diff --git a/microxrcedds_agent_cmake_module/microxrcedds_agent_cmake_module-extras.cmake b/microxrcedds_agent_cmake_module/microxrcedds_agent_cmake_module-extras.cmake deleted file mode 100644 index 6747cf4..0000000 --- a/microxrcedds_agent_cmake_module/microxrcedds_agent_cmake_module-extras.cmake +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright 2018 Proyectos y Sistemas de Mantenimiento SL (eProsima). -# -# 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. - -list(INSERT CMAKE_MODULE_PATH 0 - "${microxrcedds_agent_cmake_module_DIR}/Modules") diff --git a/microxrcedds_agent_cmake_module/package.xml b/microxrcedds_agent_cmake_module/package.xml deleted file mode 100644 index fe389ee..0000000 --- a/microxrcedds_agent_cmake_module/package.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - microxrcedds_agent_cmake_module - 0.0.1 - Provide CMake module to find eProsima Micro XRCE-DDS Agent - Borja Outerelo - Apache License 2.0 - Borja Outerelo - - ament_cmake - - ament_lint_auto - ament_lint_common - - micro-xrce-dds-agent - micro-xrce-dds-agent - - - ament_cmake - -