Skip to content

Commit

Permalink
- Add ament_index_cpp dependency to tesseract_rosutils
Browse files Browse the repository at this point in the history
- Remove ament_target_dependencies() from tesseract_ros_examples
  • Loading branch information
rjoomen committed Sep 8, 2023
1 parent a70822c commit 7b8b656
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
3 changes: 1 addition & 2 deletions tesseract_ros_examples/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,9 @@ tesseract_variables()
macro(add_example test_name test_file)
add_executable(${test_name} ${test_file})
target_link_libraries(${test_name}
${std_srvs_TARGETS}
tesseract::tesseract_examples
tesseract_monitoring::tesseract_monitoring_environment)
ament_target_dependencies(${test_name}
std_srvs)
target_compile_options(${test_name} PRIVATE ${TESSERACT_COMPILE_OPTIONS})
target_clang_tidy(${test_name} ARGUMENTS ${TESSERACT_CLANG_TIDY_ARGS} ENABLE ${TESSERACT_ENABLE_CLANG_TIDY})
target_cxx_version(${test_name} PUBLIC VERSION ${TESSERACT_CXX_VERSION})
Expand Down
4 changes: 3 additions & 1 deletion tesseract_rosutils/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ extract_package_metadata(pkg)
project(${pkg_extracted_name} VERSION ${pkg_extracted_version} LANGUAGES CXX)

# ROS
find_package(ament_index_cpp REQUIRED)
find_package(rclcpp REQUIRED)
find_package(tf2_eigen REQUIRED)
find_package(trajectory_msgs REQUIRED)
Expand All @@ -31,6 +32,7 @@ target_link_libraries(${PROJECT_NAME}
tesseract::tesseract_visualization
tesseract::tesseract_motion_planners_core
PRIVATE
ament_index_cpp::ament_index_cpp
${tf2_eigen_TARGETS}
)
target_compile_options(${PROJECT_NAME} PRIVATE ${TESSERACT_COMPILE_OPTIONS})
Expand All @@ -45,8 +47,8 @@ ament_export_dependencies(
rclcpp
trajectory_msgs
visualization_msgs
tesseract_task_composer
tesseract_msgs
tesseract_task_composer
)

# Mark cpp header files for installation
Expand Down
1 change: 1 addition & 0 deletions tesseract_rosutils/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
<buildtool_depend>ament_cmake</buildtool_depend>
<build_depend>ros_industrial_cmake_boilerplate</build_depend>

<depend>ament_index_cpp</depend>
<depend>rclcpp</depend>
<depend>tf2_eigen</depend>
<depend>trajectory_msgs</depend>
Expand Down

0 comments on commit 7b8b656

Please sign in to comment.