Skip to content

Commit

Permalink
Made assimp and qhull non-transitive dependencies.
Browse files Browse the repository at this point in the history
  • Loading branch information
peci1 authored Dec 5, 2024
1 parent f6fcd1b commit c77776a
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 7 deletions.
9 changes: 3 additions & 6 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -90,15 +90,12 @@ target_compile_options(${PROJECT_NAME} PRIVATE ${PROJECT_COMPILE_OPTIONS})
target_include_directories(${PROJECT_NAME}
PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
$<INSTALL_INTERFACE:include/${PROJECT_NAME}>)
target_link_libraries(${PROJECT_NAME} PRIVATE fcl)
ament_target_dependencies(${PROJECT_NAME} PUBLIC
${THIS_PACKAGE_EXPORT_DEPENDS}
)
ament_target_dependencies(${PROJECT_NAME} SYSTEM
# We don't export these dependencies because their cmake is broken
assimp
QHULL
)
# Private libraries that are not transitively needed by downstream projects
target_link_libraries(${PROJECT_NAME} PRIVATE assimp::assimp fcl ${QHULL_LIBRARIES})
target_include_directories(${PROJECT_NAME} PRIVATE ${QHULL_INCLUDE_DIRS})

if(BUILD_TESTING)
find_package(ament_cmake_gtest REQUIRED)
Expand Down
3 changes: 2 additions & 1 deletion package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
<depend>rclcpp</depend>
<depend>eigen_stl_containers</depend>
<depend>console_bridge_vendor</depend>
<depend>libqhull</depend>
<depend>liboctomap-dev</depend>
<depend>random_numbers</depend>
<depend>resource_retriever</depend>
Expand All @@ -38,6 +37,7 @@
<build_depend>assimp-dev</build_depend>
<build_depend>eigen</build_depend>
<build_depend>libfcl-dev</build_depend>
<build_depend>libqhull</build_depend>
<build_depend>pkg-config</build_depend>
<build_depend>libboost-dev</build_depend>
<build_depend>libboost-filesystem-dev</build_depend>
Expand All @@ -48,6 +48,7 @@
<exec_depend>libboost-filesystem</exec_depend>
<exec_depend>rosidl_default_runtime</exec_depend>
<exec_depend>libfcl</exec_depend>
<exec_depend>libqhull</build_depend>

<test_depend>ament_cmake_gtest</test_depend>
<test_depend>ament_lint_auto</test_depend>
Expand Down

0 comments on commit c77776a

Please sign in to comment.