Skip to content
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

Fix include order: correctly consider _all_ dependencies recursively #402

Open
wants to merge 2 commits into
base: galactic
Choose a base branch
from
Open

Fix include order: correctly consider _all_ dependencies recursively #402

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3a9e660
Consider include directories of all dependencies recursively
rhaschke Sep 9, 2022
9db6983
Order both, interface and other include directories together
rhaschke Sep 25, 2022
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
29 changes: 14 additions & 15 deletions ament_cmake_target_dependencies/cmake/ament_target_dependencies.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,25 +127,24 @@ function(ament_target_dependencies target)
if(NOT ARG_INTERFACE)
target_compile_definitions(${target}
${required_keyword} ${definitions})
# the interface include dirs must be ordered
set(interface_include_dirs)
foreach(interface ${interfaces})
get_target_property(_include_dirs ${interface} INTERFACE_INCLUDE_DIRECTORIES)
if(_include_dirs)
list_append_unique(interface_include_dirs ${_include_dirs})
endif()
endforeach()
ament_include_directories_order(ordered_interface_include_dirs ${interface_include_dirs})
# the interface include dirs are used privately to ensure proper order
# and the interfaces cover the public case
target_include_directories(${target} ${system_keyword}
PRIVATE ${ordered_interface_include_dirs})
endif()
ament_include_directories_order(ordered_include_dirs ${include_dirs})

# fetch include directories of all transitive dependencies (already sorted)
ament_get_recursive_properties(interface_include_dirs _ ${interfaces})
# combine with include_dirs
list_append_unique(interface_include_dirs ${include_dirs})
ament_include_directories_order(ordered_include_dirs ${interface_include_dirs})

# ordered inlcude dirs are used privately - just to ensure proper ordering
target_include_directories(${target} ${system_keyword}
PRIVATE ${ordered_include_dirs})

# the following statements cover transitive forwarding
target_link_libraries(${target}
${optional_keyword} ${interfaces})
target_include_directories(${target} ${system_keyword}
${required_keyword} ${ordered_include_dirs})
${required_keyword} ${include_dirs})

if(NOT ARG_INTERFACE)
ament_libraries_deduplicate(unique_libraries ${libraries})
target_link_libraries(${target}
Expand Down