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

Simplify ament_lint include logic #265

Closed
wants to merge 4 commits into from
Closed

Simplify ament_lint include logic #265

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0dab887
Simplify ament_lint include logic
rotu Aug 30, 2020
08818eb
Update ament_cmake_cppcheck_lint_hook.cmake
rotu Aug 30, 2020
343cc1f
unbreak it?
rotu Aug 30, 2020
4bf1453
...
rotu Aug 30, 2020
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
25 changes: 3 additions & 22 deletions ament_cmake_cppcheck/cmake/ament_cmake_cppcheck_lint_hook.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,29 +50,10 @@ if(_source_files)
if(NOT CMAKE_VERSION VERSION_LESS "3.7.0")
get_directory_property(_build_targets DIRECTORY ${PROJECT_SOURCE_DIR} BUILDSYSTEM_TARGETS)
foreach(_target ${_build_targets})
# Include directories property is different for INTERFACE libraries
get_target_property(_target_type ${_target} TYPE)
if(${_target_type} STREQUAL "INTERFACE_LIBRARY")
get_target_property(_include_dirs ${_target} INTERFACE_INCLUDE_DIRECTORIES)
else()
get_target_property(_include_dirs ${_target} INCLUDE_DIRECTORIES)
get_target_property(_target_type "${_target}" TYPE)
if(NOT ${_target_type} STREQUAL "INTERFACE_LIBRARY")
list(APPEND _all_include_dirs $<TARGET_PROPERTY:${_target},INCLUDE_DIRECTORIES>)
endif()

# Only append include directories that are from the package being tested
# This accomplishes two things:
# 1. Reduces execution time (less include directories to search)
# 2. cppcheck will not check for errors in external packages
foreach(_include_dir ${_include_dirs})
# TODO(jacobperron): Escape special regex characters in PROJECT_SOURCE_DIR
# Related CMake feature request: https://gitlab.kitware.com/cmake/cmake/issues/18409
# Check if include directory is a subdirectory of the source directory
string(REGEX MATCH "^${PROJECT_SOURCE_DIR}/.*" _is_subdirectory ${_include_dir})
# Check if include directory is part of a generator expression (e.g. $<BUILD_INTERFACE:...>)
string(REGEX MATCH "^\\$<.*:${PROJECT_SOURCE_DIR}/.*>$" _is_genexp_subdirectory "${_include_dir}")
if(_is_subdirectory OR _is_genexp_subdirectory)
list_append_unique(_all_include_dirs ${_include_dir})
endif()
endforeach()
endforeach()
endif()

Expand Down