Skip to content

Do not export fcl dependency #256

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Dec 6, 2024
Merged

Do not export fcl dependency #256

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
53ac39a
Do not export fcl dependency
peci1 Dec 5, 2024
f6fcd1b
Fixed collision between keyword and non-keyword call to target_link_l…
peci1 Dec 5, 2024
c77776a
Made assimp and qhull non-transitive dependencies.
peci1 Dec 5, 2024
2b37f95
Fixup
peci1 Dec 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions CMakeLists.txt
View file
Open in desktop
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} fcl)
ament_target_dependencies(${PROJECT_NAME}
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
View file
Open in desktop
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</exec_depend>

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