From 8d3b66e98c09065c8f3157cffaf229eaf8020fa1 Mon Sep 17 00:00:00 2001 From: JafarAbdi Date: Tue, 5 Apr 2022 14:22:29 +0000 Subject: [PATCH] rviz_marker_tools: Fix dependencies --- rviz_marker_tools/CMakeLists.txt | 45 ++++++++++++++------------------ rviz_marker_tools/package.xml | 1 + 2 files changed, 21 insertions(+), 25 deletions(-) diff --git a/rviz_marker_tools/CMakeLists.txt b/rviz_marker_tools/CMakeLists.txt index 19b67eaa..fc91f042 100644 --- a/rviz_marker_tools/CMakeLists.txt +++ b/rviz_marker_tools/CMakeLists.txt @@ -1,30 +1,32 @@ cmake_minimum_required(VERSION 3.5) project(rviz_marker_tools) -find_package(geometry_msgs REQUIRED) -find_package(visualization_msgs REQUIRED) -find_package(rclcpp REQUIRED) -find_package(rviz2 REQUIRED) -find_package(eigen3_cmake_module REQUIRED) -find_package(Eigen3 REQUIRED) -find_package(tf2_eigen REQUIRED) +find_package(ament_cmake REQUIRED) + +set(THIS_PACKAGE_INCLUDE_DEPENDS + geometry_msgs + visualization_msgs + rclcpp + rviz2 + eigen3_cmake_module + Eigen3 + urdfdom_headers + tf2_eigen +) + +foreach(dependency IN ITEMS ${THIS_PACKAGE_INCLUDE_DEPENDS}) + find_package(${dependency} REQUIRED) +endforeach() if(NOT CMAKE_CXX_STANDARD) set(CMAKE_CXX_STANDARD 17) endif() -set(PROJECT_INCLUDE ${CMAKE_CURRENT_SOURCE_DIR}/include/${PROJECT_NAME}) - -set(HEADERS - ${PROJECT_INCLUDE}/marker_creation.h -) - add_library(${PROJECT_NAME} SHARED - ${HEADERS} src/marker_creation.cpp ) -ament_target_dependencies(${PROJECT_NAME} visualization_msgs geometry_msgs Eigen3) +ament_target_dependencies(${PROJECT_NAME} ${THIS_PACKAGE_INCLUDE_DEPENDS}) target_include_directories(${PROJECT_NAME} PUBLIC $ @@ -34,17 +36,10 @@ target_include_directories(${PROJECT_NAME} install(DIRECTORY include/ DESTINATION include) install(TARGETS ${PROJECT_NAME} - EXPORT ${PROJECT_NAME} + EXPORT ${PROJECT_NAME}Targets ARCHIVE DESTINATION lib LIBRARY DESTINATION lib) -ament_export_include_directories(include) -ament_export_libraries(${PROJECT_NAME}) -ament_export_dependencies(eigen3_cmake_module) -ament_export_dependencies(Eigen3) -ament_export_dependencies(geometry_msgs) -ament_export_dependencies(visualization_msgs) -ament_export_dependencies(rclcpp) -ament_export_dependencies(rviz2) -ament_export_dependencies(tf2_eigen) +ament_export_targets(${PROJECT_NAME}Targets HAS_LIBRARY_TARGET) +ament_export_dependencies(${THIS_PACKAGE_INCLUDE_DEPENDS}) ament_package() diff --git a/rviz_marker_tools/package.xml b/rviz_marker_tools/package.xml index c53924e0..9dcf30b7 100644 --- a/rviz_marker_tools/package.xml +++ b/rviz_marker_tools/package.xml @@ -15,6 +15,7 @@ geometry_msgs rclcpp rviz2 + urdfdom_headers tf2_eigen