Depend on orocos_kdl_vendor

* Change package.xml dependency to the vendor package * Add missing include directories for orocos_kdl Upstream should probably be updated to use modern cmake targets. Signed-off-by: Jacob Perron <jacob@openrobotics.org>
ros2 · Apr 1, 2022 · ebedf3c · ebedf3c
1 parent 0163c86
commit ebedf3c
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 6 deletions.
diff --git a/tf2_eigen_kdl/package.xml b/tf2_eigen_kdl/package.xml
@@ -19,7 +19,7 @@
   <build_depend>eigen</build_depend>
   <build_export_depend>eigen</build_export_depend>
 
-  <depend>orocos_kdl</depend>
+  <depend>orocos_kdl_vendor</depend>
   <depend>tf2</depend>
 
   <test_depend>ament_cmake_gtest</test_depend>

diff --git a/tf2_geometry_msgs/CMakeLists.txt b/tf2_geometry_msgs/CMakeLists.txt
@@ -20,7 +20,8 @@ ament_python_install_package(${PROJECT_NAME}
 add_library(${PROJECT_NAME} INTERFACE)
 target_include_directories(${PROJECT_NAME} INTERFACE
   "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
-  "$<INSTALL_INTERFACE:include/${PROJECT_NAME}>")
+  "$<INSTALL_INTERFACE:include/${PROJECT_NAME}>"
+  ${orocos_kdl_INCLUDE_DIRS})
 target_link_libraries(${PROJECT_NAME} INTERFACE
   ${geometry_msgs_TARGETS}
   orocos-kdl

diff --git a/tf2_geometry_msgs/package.xml b/tf2_geometry_msgs/package.xml
@@ -14,7 +14,7 @@
   <buildtool_depend>ament_cmake</buildtool_depend>
 
   <depend>geometry_msgs</depend>
-  <depend>orocos_kdl</depend>
+  <depend>orocos_kdl_vendor</depend>
   <depend>tf2</depend>
   <depend>tf2_ros</depend>
 

diff --git a/tf2_kdl/CMakeLists.txt b/tf2_kdl/CMakeLists.txt
@@ -29,7 +29,8 @@ target_link_libraries(tf2_kdl INTERFACE
   tf2_ros::tf2_ros)
 target_include_directories(tf2_kdl INTERFACE
   "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
-  "$<INSTALL_INTERFACE:include/${PROJECT_NAME}>")
+  "$<INSTALL_INTERFACE:include/${PROJECT_NAME}>"
+  ${orocos_kdl_INCLUDE_DIRS})
 
 install(TARGETS tf2_kdl EXPORT export_tf2_kdl)
 
@@ -61,5 +62,6 @@ ament_export_include_directories("include/${PROJECT_NAME}")
 # Export modern CMake targets
 ament_export_targets(export_tf2_kdl)
 
-ament_export_dependencies(builtin_interfaces geometry_msgs orocos_kdl tf2 tf2_ros)
+ament_export_dependencies(builtin_interfaces geometry_msgs orocos_kdl_vendor tf2 tf2_ros)
+
 ament_package()
diff --git a/tf2_kdl/package.xml b/tf2_kdl/package.xml
@@ -15,7 +15,7 @@
 
   <depend>builtin_interfaces</depend>
   <depend>geometry_msgs</depend>
-  <depend>orocos_kdl</depend>
+  <depend>orocos_kdl_vendor</depend>
   <depend>tf2</depend>
   <depend>tf2_ros</depend>